Pyomo 6

.github/workflows/pyotracker.yml

@@ -30,8 +30,6 @@ jobs:
 
       - name: set up pyomo
         run: |
-          git clone https://github.com/PyUtilib/pyutilib.git
-          cd pyutilib && python ./setup.py develop && cd ..
           git clone https://github.com/pyomo/pyomo
           cd pyomo && python setup.py develop
 

docker-actions/weekly/Dockerfile

@@ -21,10 +21,7 @@ RUN pip install xpress
 RUN apt update
 RUN apt install -y git-all
 
-# get pyutilib and pyomo from the web
-RUN git clone https://github.com/PyUtilib/pyutilib.git
-RUN cd pyutilib && python ./setup.py develop && cd ..
-# (the last cd .. is probably not needed)
+# get pyomo from the web
 
 RUN git clone https://github.com/pyomo/pyomo
 

mpisppy/__init__.py

@@ -1,14 +1,7 @@
 # Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
 # This software is distributed under the 3-clause BSD License.
 
-import pyomo as _pyo
-
-pyomo6 = (int(_pyo.__version__[0]) >= 6)
-
-if pyomo6:
-    from pyomo.common.timing import TicTocTimer as _TTT
-else:
-    from pyutilib.misc.timing import TicTocTimer as _TTT
+from pyomo.common.timing import TicTocTimer as _TTT
 
 try:
     import mpi4py.MPI as _mpi

mpisppy/utils/pysp_model.py

@@ -6,18 +6,11 @@
 
 import mpisppy
 
-if mpisppy.pyomo6:
-    from pysp.scenariotree.tree_structure_model import \
-            CreateAbstractScenarioTreeModel, ScenarioTreeModelFromNetworkX
-    from pysp.phutils import isVariableNameIndexed,\
-                                    extractVariableNameAndIndex
-    from pyomo.common.fileutils import import_file
-else:
-    from pyomo.pysp.scenariotree.tree_structure_model import \
-            CreateAbstractScenarioTreeModel, ScenarioTreeModelFromNetworkX
-    from pyomo.pysp.phutils import isVariableNameIndexed,\
-                                    extractVariableNameAndIndex
-    from pyutilib.misc.import_file import import_file
+from pysp.scenariotree.tree_structure_model import \
+        CreateAbstractScenarioTreeModel, ScenarioTreeModelFromNetworkX
+from pysp.phutils import isVariableNameIndexed,\
+                                extractVariableNameAndIndex
+from pyomo.common.fileutils import import_file
 
 from mpisppy.scenario_tree import ScenarioNode as mpisppyScenarioNode
 from mpisppy.utils.sputils import create_EF as create_mpisppy_EF

requirements.txt

@@ -1,5 +1,4 @@
 mpi4py>=3.0.3
 numpy>=1.19
-pyutilib>=6.0
-pyomo>=5.7.1
+pyomo>=6.0
 scipy>=1.5