Merge pull request #113 from staadecker/hotfix

Remove outdated patch causing crash

setup.py

@@ -69,7 +69,7 @@ def read(*rnames):
     ],
     python_requires=">=3.7",
     install_requires=[
-        "Pyomo>=6.0",  # We need a version that works with glpk 4.60+
+        "Pyomo>=6.1",  # 6.1 Has all the bug fixes we need
         "pint",  # needed by Pyomo when we run our tests, but not included
         "testfixtures",  # used for standard tests
         "pandas",  # used for input upgrades and testing that functionality

switch_model/utilities/patches.py

@@ -1,4 +1,3 @@
-import inspect
 import textwrap
 import types
 from typing import Type
@@ -16,63 +15,13 @@ def patch_pyomo():
     if _patched_pyomo:
         return
 
-    # fix Pyomo issue #2019. Once PR #2020 gets released this will no longer be needed
-    from pyomo.core.base.misc import _robust_sort_keyfcn
-
-    setattr(_robust_sort_keyfcn, "__call__", fixed_robust_sort_keyfcn)
-
     # Patch Set and Param to allow specifying input file location (via input_file="...")
     extend_to_allow_loading(Set)
     extend_to_allow_loading(Param)
 
     _patched_pyomo = True
 
 
-def fixed_robust_sort_keyfcn(self, val, use_key=True):
-    """Generate a tuple ( str(type_name), val ) for sorting the value.
-
-    `key=` expects a function.  We are generating a functor so we
-    have a convenient place to store the _typemap, which converts
-    the type-specific functions for converting a value to the second
-    argument of the sort key.
-
-    """
-    if use_key and self._key is not None:
-        val = self._key(val)
-
-    try:
-        i, _typename = self._typemap[val.__class__]
-    except KeyError:
-        # If this is not a type we have seen before, determine what
-        # to use for the second value in the tuple.
-        _type = val.__class__
-        _typename = _type.__name__
-        try:
-            # 1: Check if the type is comparable.  In Python 3, sorted()
-            #    uses "<" to compare objects.
-            val < val
-            i = 1
-        except:
-            try:
-                # 2: try converting the value to string
-                str(val)
-                i = 2
-            except:
-                # 3: fallback on id().  Not deterministic
-                #    (run-to-run), but at least is consistent within
-                #    this run.
-                i = 3
-        self._typemap[_type] = i, _typename
-    if i == 1:
-        return _typename, val
-    elif i == 3:
-        return _typename, tuple(self(v, use_key=False) for v in val)
-    elif i == 2:
-        return _typename, str(val)
-    else:
-        return _typename, id(val)
-
-
 def extend_to_allow_loading(cls: Type):
     def new_init(
         self, *args, input_file=None, input_column=None, input_optional=None, **kwargs

switch_model/wecc/get_inputs/post_process_steps/reserve_technologies.py

@@ -13,10 +13,10 @@
     name="no_fosill_reserve",
     msg="Aggregating candidate projects by load zone for specified technologies",
     only_with_config=True,
-    priority=4
+    priority=4,
 )
 def post_process(config):
-    """ This function sets to zero the column that allows each candidate technology to
+    """This function sets to zero the column that allows each candidate technology to
     proividee"""
 
     fname = "generation_projects_info.csv"