Fix pyutilib dependency; Fix pytest-attrdict issue

calliope/backend/pyomo/model.py

@@ -19,7 +19,7 @@
 import pyomo.environ as pe  # pylint: disable=unused-import,import-error
 
 # TempfileManager is required to set log directory
-from pyutilib.services import TempfileManager  # pylint: disable=import-error
+from pyomo.common.tempfiles import TempfileManager  # pylint: disable=import-error
 
 from calliope.backend.pyomo.util import (
     get_var,

calliope/core/attrdict.py

@@ -65,7 +65,13 @@ class AttrDict(dict):
 
     """
 
-    __getattr__ = dict.__getitem__
+    def __getattr__(self, item):
+        try:
+            return self[item]
+        except KeyError:
+            if item.startswith("__"):
+                raise AttributeError
+
     __setattr__ = dict.__setitem__
 
     def __init__(self, source_dict=None):

doc/conf.py

@@ -65,9 +65,9 @@ def __getattr__(cls, name):
     "pyomo.core",
     "pyomo.opt",
     "pyomo.environ",
-    "pyutilib",
-    "pyutilib.services",
-    "pyutilib.services.TempfileManager",
+    "pyomo.common",
+    "pyomo.common.tempfiles",
+    "pyomo.common.tempfiles.TempfileManager",
     "yaml",
     "pandas",
     "pandas.api",

requirements.yml

@@ -22,7 +22,7 @@ dependencies:
     - pyomo=6.0
     - pytest-cov
     - pytest-xdist  # pytest distributed testing plugin
-    - pytest=5.2  # 5.3 fails with KeyError: '__name__' when collecting items
+    - pytest
     - ruamel.yaml=0.16
     - scikit-learn
     - xarray=0.17