Merge branch 'main' into immutable-expr-args

jsiirola · web-flow · commit 0d004106de2f · 2024-01-23T22:34:33.000-05:00
diff --git a/pyomo/contrib/parmest/examples/reactor_design/bootstrap_example.py b/pyomo/contrib/parmest/examples/reactor_design/bootstrap_example.py
@@ -9,7 +9,7 @@
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
 
-import pandas as pd
+from pyomo.common.dependencies import pandas as pd
 from os.path import join, abspath, dirname
 import pyomo.contrib.parmest.parmest as parmest
 from pyomo.contrib.parmest.examples.reactor_design.reactor_design import (
diff --git a/pyomo/contrib/parmest/examples/reactor_design/datarec_example.py b/pyomo/contrib/parmest/examples/reactor_design/datarec_example.py
@@ -9,8 +9,7 @@
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
 
-import numpy as np
-import pandas as pd
+from pyomo.common.dependencies import numpy as np, pandas as pd
 import pyomo.contrib.parmest.parmest as parmest
 from pyomo.contrib.parmest.examples.reactor_design.reactor_design import (
     reactor_design_model,
diff --git a/pyomo/contrib/parmest/examples/reactor_design/leaveNout_example.py b/pyomo/contrib/parmest/examples/reactor_design/leaveNout_example.py
@@ -9,8 +9,7 @@
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
 
-import numpy as np
-import pandas as pd
+from pyomo.common.dependencies import numpy as np, pandas as pd
 from os.path import join, abspath, dirname
 import pyomo.contrib.parmest.parmest as parmest
 from pyomo.contrib.parmest.examples.reactor_design.reactor_design import (
diff --git a/pyomo/contrib/parmest/examples/reactor_design/likelihood_ratio_example.py b/pyomo/contrib/parmest/examples/reactor_design/likelihood_ratio_example.py
@@ -9,8 +9,7 @@
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
 
-import numpy as np
-import pandas as pd
+from pyomo.common.dependencies import numpy as np, pandas as pd
 from itertools import product
 from os.path import join, abspath, dirname
 import pyomo.contrib.parmest.parmest as parmest
diff --git a/pyomo/contrib/parmest/examples/reactor_design/multisensor_data_example.py b/pyomo/contrib/parmest/examples/reactor_design/multisensor_data_example.py
@@ -9,7 +9,7 @@
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
 
-import pandas as pd
+from pyomo.common.dependencies import pandas as pd
 from os.path import join, abspath, dirname
 import pyomo.contrib.parmest.parmest as parmest
 from pyomo.contrib.parmest.examples.reactor_design.reactor_design import (
diff --git a/pyomo/contrib/parmest/examples/reactor_design/parameter_estimation_example.py b/pyomo/contrib/parmest/examples/reactor_design/parameter_estimation_example.py
@@ -9,7 +9,7 @@
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
 
-import pandas as pd
+from pyomo.common.dependencies import pandas as pd
 from os.path import join, abspath, dirname
 import pyomo.contrib.parmest.parmest as parmest
 from pyomo.contrib.parmest.examples.reactor_design.reactor_design import (
diff --git a/pyomo/contrib/parmest/examples/reactor_design/reactor_design.py b/pyomo/contrib/parmest/examples/reactor_design/reactor_design.py
@@ -12,7 +12,7 @@
 Continuously stirred tank reactor model, based on
 pyomo/examples/doc/pyomobook/nonlinear-ch/react_design/ReactorDesign.py
 """
-import pandas as pd
+from pyomo.common.dependencies import pandas as pd
 from pyomo.environ import (
     ConcreteModel,
     Param,
diff --git a/pyomo/contrib/parmest/examples/reactor_design/timeseries_data_example.py b/pyomo/contrib/parmest/examples/reactor_design/timeseries_data_example.py
@@ -9,7 +9,7 @@
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
 
-import pandas as pd
+from pyomo.common.dependencies import pandas as pd
 from os.path import join, abspath, dirname
 
 import pyomo.contrib.parmest.parmest as parmest
diff --git a/pyomo/contrib/parmest/examples/rooney_biegler/bootstrap_example.py b/pyomo/contrib/parmest/examples/rooney_biegler/bootstrap_example.py
@@ -9,7 +9,7 @@
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
 
-import pandas as pd
+from pyomo.common.dependencies import pandas as pd
 import pyomo.contrib.parmest.parmest as parmest
 from pyomo.contrib.parmest.examples.rooney_biegler.rooney_biegler import (
     rooney_biegler_model,
diff --git a/pyomo/contrib/parmest/examples/rooney_biegler/likelihood_ratio_example.py b/pyomo/contrib/parmest/examples/rooney_biegler/likelihood_ratio_example.py
@@ -9,8 +9,7 @@
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
 
-import numpy as np
-import pandas as pd
+from pyomo.common.dependencies import numpy as np, pandas as pd
 from itertools import product
 import pyomo.contrib.parmest.parmest as parmest
 from pyomo.contrib.parmest.examples.rooney_biegler.rooney_biegler import (
diff --git a/pyomo/contrib/parmest/examples/rooney_biegler/parameter_estimation_example.py b/pyomo/contrib/parmest/examples/rooney_biegler/parameter_estimation_example.py
@@ -9,7 +9,7 @@
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
 
-import pandas as pd
+from pyomo.common.dependencies import pandas as pd
 import pyomo.contrib.parmest.parmest as parmest
 from pyomo.contrib.parmest.examples.rooney_biegler.rooney_biegler import (
     rooney_biegler_model,
diff --git a/pyomo/contrib/parmest/examples/rooney_biegler/rooney_biegler.py b/pyomo/contrib/parmest/examples/rooney_biegler/rooney_biegler.py
@@ -15,7 +15,7 @@
 47(8), 1794-1804.
 """
 
-import pandas as pd
+from pyomo.common.dependencies import pandas as pd
 import pyomo.environ as pyo
 
 
diff --git a/pyomo/contrib/parmest/examples/rooney_biegler/rooney_biegler_with_constraint.py b/pyomo/contrib/parmest/examples/rooney_biegler/rooney_biegler_with_constraint.py
@@ -15,7 +15,7 @@
 47(8), 1794-1804.
 """
 
-import pandas as pd
+from pyomo.common.dependencies import pandas as pd
 import pyomo.environ as pyo
 
 
diff --git a/pyomo/contrib/parmest/examples/semibatch/parallel_example.py b/pyomo/contrib/parmest/examples/semibatch/parallel_example.py
@@ -14,8 +14,7 @@
 parallel and save results to files for later analysis and graphics.
 Example command: mpiexec -n 4 python parallel_example.py
 """
-import numpy as np
-import pandas as pd
+from pyomo.common.dependencies import numpy as np, pandas as pd
 from itertools import product
 from os.path import join, abspath, dirname
 import pyomo.contrib.parmest.parmest as parmest
diff --git a/pyomo/contrib/pynumero/examples/callback/cyipopt_functor_callback.py b/pyomo/contrib/pynumero/examples/callback/cyipopt_functor_callback.py
@@ -1,6 +1,6 @@
 import pyomo.environ as pyo
 from pyomo.contrib.pynumero.examples.callback.reactor_design import model as m
-import pandas as pd
+from pyomo.common.dependencies import pandas as pd
 
 """
 This example uses an iteration callback with a functor to store
diff --git a/pyomo/contrib/pynumero/examples/external_grey_box/param_est/generate_data.py b/pyomo/contrib/pynumero/examples/external_grey_box/param_est/generate_data.py
@@ -1,7 +1,7 @@
 import pyomo.environ as pyo
 import numpy.random as rnd
 import pyomo.contrib.pynumero.examples.external_grey_box.param_est.models as pm
-import pandas as pd
+from pyomo.common.dependencies import pandas as pd
 
 
 def generate_data(N, UA_mean, UA_std, seed=42):
diff --git a/pyomo/contrib/pynumero/examples/external_grey_box/param_est/perform_estimation.py b/pyomo/contrib/pynumero/examples/external_grey_box/param_est/perform_estimation.py
@@ -1,7 +1,7 @@
 import sys
 import pyomo.environ as pyo
 import numpy.random as rnd
-import pandas as pd
+from pyomo.common.dependencies import pandas as pd
 import pyomo.contrib.pynumero.examples.external_grey_box.param_est.models as po
 
 
diff --git a/pyomo/contrib/pyros/tests/test_grcs.py b/pyomo/contrib/pyros/tests/test_grcs.py
@@ -4876,9 +4876,7 @@ def test_higher_order_decision_rules(self):
             msg="Returned termination condition is not return robust_optimal.",
         )
 
-    @unittest.skipUnless(
-        baron_license_is_valid, "Global NLP solver is not available and licensed."
-    )
+    @unittest.skipUnless(scip_available, "Global NLP solver is not available.")
     def test_coefficient_matching_solve(self):
         # Write the deterministic Pyomo model
         m = ConcreteModel()
@@ -4902,8 +4900,8 @@ def test_coefficient_matching_solve(self):
         pyros_solver = SolverFactory("pyros")
 
         # Define subsolvers utilized in the algorithm
-        local_subsolver = SolverFactory('baron')
-        global_subsolver = SolverFactory("baron")
+        local_subsolver = SolverFactory('scip')
+        global_subsolver = SolverFactory("scip")
 
         # Call the PyROS solver
         results = pyros_solver.solve(
@@ -5009,10 +5007,7 @@ def test_coeff_matching_solver_insensitive(self):
                 ),
             )
 
-    @unittest.skipUnless(
-        baron_license_is_valid and baron_version >= (23, 2, 27),
-        "BARON licensing and version requirements not met",
-    )
+    @unittest.skipUnless(scip_available, "NLP solver is not available.")
     def test_coefficient_matching_partitioning_insensitive(self):
         """
         Check that result for instance with constraint subject to
@@ -5023,7 +5018,7 @@ def test_coefficient_matching_partitioning_insensitive(self):
         m = self.create_mitsos_4_3()
 
         # instantiate BARON subsolver and PyROS solver
-        baron = SolverFactory("baron")
+        baron = SolverFactory("scip")
         pyros_solver = SolverFactory("pyros")
 
         # solve with PyROS
@@ -5215,10 +5210,7 @@ def test_coefficient_matching_nonlinear_expr(self):
             )
 
 
-@unittest.skipUnless(
-    baron_available and baron_license_is_valid,
-    "Global NLP solver is not available and licensed.",
-)
+@unittest.skipUnless(scip_available, "Global NLP solver is not available.")
 class testBypassingSeparation(unittest.TestCase):
     def test_bypass_global_separation(self):
         """Test bypassing of global separation solve calls."""
@@ -5241,7 +5233,7 @@ def test_bypass_global_separation(self):
 
         # Define subsolvers utilized in the algorithm
         local_subsolver = SolverFactory('ipopt')
-        global_subsolver = SolverFactory("baron")
+        global_subsolver = SolverFactory("scip")
 
         # Call the PyROS solver
         with LoggingIntercept(level=logging.WARNING) as LOG:
@@ -5360,10 +5352,7 @@ def test_uninitialized_vars(self):
             )
 
 
-@unittest.skipUnless(
-    baron_available and baron_license_is_valid,
-    "Global NLP solver is not available and licensed.",
-)
+@unittest.skipUnless(scip_available, "Global NLP solver is not available.")
 class testModelMultipleObjectives(unittest.TestCase):
     """
     This class contains tests for models with multiple
@@ -5398,7 +5387,7 @@ def test_multiple_objs(self):
 
         # Define subsolvers utilized in the algorithm
         local_subsolver = SolverFactory('ipopt')
-        global_subsolver = SolverFactory("baron")
+        global_subsolver = SolverFactory("scip")
 
         solve_kwargs = dict(
             model=m,
diff --git a/pyomo/contrib/sensitivity_toolbox/examples/rooney_biegler.py b/pyomo/contrib/sensitivity_toolbox/examples/rooney_biegler.py
@@ -15,7 +15,7 @@
 model parameter uncertainty using nonlinear confidence regions. AIChE Journal, 
 47(8), 1794-1804.
 """
-import pandas as pd
+from pyomo.common.dependencies import pandas as pd
 import pyomo.environ as pyo
 
 
