Merge branch 'main' into prommis-util

Author: blnicho

idaes/core/base/tests/test_process_base.py

@@ -146,8 +146,8 @@ def dummy_performance(self, time_point):
     Variables: 
 
     Key           : Value  : Units  : Fixed : Bounds
-    Indexed Var 1 : 42.000 : second : False : (None, None)
        Scalar Var : 7.0000 :  meter : False : (None, None)
+    Indexed Var 1 : 42.000 : second : False : (None, None)
 
     Expressions: 
 

pyproject.toml

@@ -38,7 +38,7 @@ keywords=["IDAES", "idaes-pse", "energy systems", "chemical engineering", "proce
 version = "2.11.0dev0"
 # dynamic = ["version"]
 dependencies = [
-  "pyomo >= 6.9.3",
+  "pyomo >= 6.10.0",
   "pint >= 0.24.1", # required to use Pyomo units. Pint 0.24.1 needed for Python 3.9 support
   "networkx", # required to use Pyomo network
   "numpy>=1,<3",