From e164f0e392886215e2f439e643f3e1a89d11c451 Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Thu, 8 Aug 2024 11:55:47 -0600 Subject: [PATCH 1/9] Bumping the IDAES tag of Pyomo to check for issues --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 46139e3629..b324eb8c1d 100644 --- a/setup.py +++ b/setup.py @@ -132,7 +132,7 @@ def __getitem__(self, key): # Put abstract (non-versioned) deps here. # Concrete dependencies go in requirements[-dev].txt install_requires=[ - "pyomo >= 6.7.3", + "pyomo >= @ https://github.com/IDAES/pyomo/archive/6.7.4.idaes.2024.08.08.zip", "pint<0.24", # required to use Pyomo units. Pint 0.24 only supported on Python >=3.10 "networkx", # required to use Pyomo network "numpy<2", From 55a60c2a9f7601bcf3f01f138dfad1fbcd9086d6 Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Thu, 8 Aug 2024 11:59:31 -0600 Subject: [PATCH 2/9] Fixing typo --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b324eb8c1d..a8186b2362 100644 --- a/setup.py +++ b/setup.py @@ -132,7 +132,7 @@ def __getitem__(self, key): # Put abstract (non-versioned) deps here. # Concrete dependencies go in requirements[-dev].txt install_requires=[ - "pyomo >= @ https://github.com/IDAES/pyomo/archive/6.7.4.idaes.2024.08.08.zip", + "pyomo @ https://github.com/IDAES/pyomo/archive/6.7.4.idaes.2024.08.08.zip", "pint<0.24", # required to use Pyomo units. Pint 0.24 only supported on Python >=3.10 "networkx", # required to use Pyomo network "numpy<2", From 09a255fba3407f3e531e9dea915b47615b4f94be Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Mon, 19 Aug 2024 23:29:27 -0600 Subject: [PATCH 3/9] Bumping IDAES tag of Pyomo again --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a8186b2362..d6b6c12e11 100644 --- a/setup.py +++ b/setup.py @@ -132,7 +132,7 @@ def __getitem__(self, key): # Put abstract (non-versioned) deps here. # Concrete dependencies go in requirements[-dev].txt install_requires=[ - "pyomo @ https://github.com/IDAES/pyomo/archive/6.7.4.idaes.2024.08.08.zip", + "pyomo @ https://github.com/IDAES/pyomo/archive/6.7.4.idaes.2024.08.19.zip", "pint<0.24", # required to use Pyomo units. Pint 0.24 only supported on Python >=3.10 "networkx", # required to use Pyomo network "numpy<2", From 568fc8350270f4549ad55148dfebb97126c9b9a8 Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Wed, 21 Aug 2024 10:45:39 -0600 Subject: [PATCH 4/9] Update Pyomo requirement to 6.8.0 release --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d6b6c12e11..9162e8e68e 100644 --- a/setup.py +++ b/setup.py @@ -132,7 +132,7 @@ def __getitem__(self, key): # Put abstract (non-versioned) deps here. # Concrete dependencies go in requirements[-dev].txt install_requires=[ - "pyomo @ https://github.com/IDAES/pyomo/archive/6.7.4.idaes.2024.08.19.zip", + "pyomo >= 6.8.0", "pint<0.24", # required to use Pyomo units. Pint 0.24 only supported on Python >=3.10 "networkx", # required to use Pyomo network "numpy<2", From 3d0aa919b07e836c026080a380ffff40fd801452 Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Thu, 22 Aug 2024 13:37:33 -0500 Subject: [PATCH 5/9] Remove exclusion for NumPy 2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9162e8e68e..3960a57202 100644 --- a/setup.py +++ b/setup.py @@ -135,7 +135,7 @@ def __getitem__(self, key): "pyomo >= 6.8.0", "pint<0.24", # required to use Pyomo units. Pint 0.24 only supported on Python >=3.10 "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", From 3c1f973bc9ce73ede4828df2bb26016bd752ad13 Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Thu, 22 Aug 2024 20:08:10 -0500 Subject: [PATCH 6/9] Update Pint to 0.24.1 for Python 3.9 support --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 951f2b0013..5b16522ff6 100644 --- a/setup.py +++ b/setup.py @@ -133,7 +133,7 @@ def __getitem__(self, key): # Concrete dependencies go in requirements[-dev].txt install_requires=[ "pyomo >= 6.8.0", - "pint<0.24", # required to use Pyomo units. Pint 0.24 only supported on Python >=3.10 + "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", # pandas constraint added on 2023-08-30 b/c bug in v2.1 From 7116dd0b4b6cf46a01cb11a49d6348948ccaf843 Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Fri, 23 Aug 2024 10:07:35 -0500 Subject: [PATCH 7/9] Use idaes-ui from IDAES/idaes-ui#52 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5b16522ff6..bfcf3ef6cd 100644 --- 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", From 632968072dda37b735a8014356883ddc0e97c277 Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Fri, 23 Aug 2024 11:46:06 -0500 Subject: [PATCH 8/9] np.Inf -> np.inf --- idaes/core/surrogate/pysmo/polynomial_regression.py | 6 +++--- .../surrogate/pysmo/tests/test_polynomial_regression.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/idaes/core/surrogate/pysmo/polynomial_regression.py b/idaes/core/surrogate/pysmo/polynomial_regression.py index 9587e71205..011ea3ff12 100644 --- a/idaes/core/surrogate/pysmo/polynomial_regression.py +++ b/idaes/core/surrogate/pysmo/polynomial_regression.py @@ -915,9 +915,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 index f6f1c75b32..264a84fc0f 100644 --- a/idaes/core/surrogate/pysmo/tests/test_polynomial_regression.py +++ b/idaes/core/surrogate/pysmo/tests/test_polynomial_regression.py @@ -1516,7 +1516,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 ) From 9b3ebb7a13046316171085ac45bbc3a327011594 Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Fri, 23 Aug 2024 11:46:33 -0500 Subject: [PATCH 9/9] np.NaN -> np.nan --- idaes/core/surrogate/pysmo/tests/test_radial_basis_function.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idaes/core/surrogate/pysmo/tests/test_radial_basis_function.py b/idaes/core/surrogate/pysmo/tests/test_radial_basis_function.py index 05b6aa4228..2b2c9b619b 100644 --- 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))