Merge branch 'main' into fix_test_errors

IDAES · Aug 23, 2024 · 8577f4e · 8577f4e
2 parents 3066db0 + 575953b
commit 8577f4e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/idaes/core/surrogate/pysmo/polynomial_regression.py b/idaes/core/surrogate/pysmo/polynomial_regression.py
@@ -916,9 +916,9 @@ def polyregression(
 
         else:
             phi_vector = np.zeros((x_polynomial_data.shape[1], 1))
-            phi_vector[:, 0] = np.Inf
-            training_error = np.Inf
-            crossval_error = np.Inf
+            phi_vector[:, 0] = np.inf
+            training_error = np.inf
+            crossval_error = np.inf
 
         # print(poly_order, x_polynomial_data.shape[0], x_polynomial_data.shape[1], training_error, crossval_error)
 

diff --git a/idaes/core/surrogate/pysmo/tests/test_polynomial_regression.py b/idaes/core/surrogate/pysmo/tests/test_polynomial_regression.py
@@ -1530,7 +1530,7 @@ def test_polyregression_04(self, array_type1, array_type2):
         poly_order = 10
         training_data = regression_data_input[0:20, :]
         test_data = regression_data_input[20:, :]
-        expected_output = np.Inf
+        expected_output = np.inf
         output_1, output_2, output_3 = data_feed.polyregression(
             poly_order, training_data, test_data
         )

diff --git a/idaes/core/surrogate/pysmo/tests/test_radial_basis_function.py b/idaes/core/surrogate/pysmo/tests/test_radial_basis_function.py
@@ -498,7 +498,7 @@ def test_thin_plate_spline_transformation(self):
                 [0.5, 0.7],
                 [5, 7],
                 [50, 70],
-                [50, np.NaN],
+                [50, np.nan],
             ]
         )
         expected_output = np.nan_to_num(d_vec**2 * np.log(d_vec))

diff --git a/setup.py b/setup.py
@@ -71,7 +71,7 @@ class ExtraDependencies:
     ui = [
         # FIXME this must be changed to the PyPI distribution for the release
         # "idaes-ui",
-        "idaes-ui @ git+https://github.com/IDAES/idaes-ui@main",
+        "idaes-ui @ git+https://github.com/IDAES/idaes-ui@refs/pull/52/merge",
     ]
     _ipython = [
         "ipython",
@@ -132,10 +132,10 @@ def __getitem__(self, key):
     # Put abstract (non-versioned) deps here.
     # Concrete dependencies go in requirements[-dev].txt
     install_requires=[
-        "pyomo >= 6.7.3",
-        "pint<0.24",  # required to use Pyomo units. Pint 0.24 only supported on Python >=3.10
+        "pyomo >= 6.8.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<2",
+        "numpy>=1,<3",
         # pandas constraint added on 2023-08-30 b/c bug in v2.1
         # see IDAES/idaes-pse#1253
         "pandas!=2.1.0,<3",