From 14b161b72d6da2c059b7aad2aa1893c64988d5c2 Mon Sep 17 00:00:00 2001 From: blnicho Date: Wed, 6 Nov 2024 22:34:48 -0700 Subject: [PATCH 01/10] Updating Pyomo tag to check IDAES tests in preparation for the release --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 19868f5d1d..43ad87f6ec 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,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.8.0.idaes.2024.10.25.zip", + "pyomo @ https://github.com/IDAES/pyomo/archive/6.8.0.idaes.2024.11.06.zip", "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", From 8738ba4b8f927574fcf8916669e6c1ea632f93d6 Mon Sep 17 00:00:00 2001 From: blnicho Date: Wed, 6 Nov 2024 22:50:43 -0700 Subject: [PATCH 02/10] Pinning to numpy<2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 43ad87f6ec..95de8ab39b 100644 --- a/setup.py +++ b/setup.py @@ -85,7 +85,7 @@ def __getitem__(self, key): "pyomo @ https://github.com/IDAES/pyomo/archive/6.8.0.idaes.2024.11.06.zip", "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", + "numpy>=1,<2", # Need <2 until there is a compatible Pint version # pandas constraint added on 2023-08-30 b/c bug in v2.1 # see IDAES/idaes-pse#1253 "pandas!=2.1.0,<3", From 8f7efe7392e21b55305aca7d07aeade754452b41 Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Wed, 6 Nov 2024 23:16:25 -0700 Subject: [PATCH 03/10] Debugging test failures --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 95de8ab39b..e7e7b6ccb4 100644 --- a/setup.py +++ b/setup.py @@ -85,7 +85,7 @@ def __getitem__(self, key): "pyomo @ https://github.com/IDAES/pyomo/archive/6.8.0.idaes.2024.11.06.zip", "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,<2", # Need <2 until there is a compatible Pint version + "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", @@ -93,6 +93,7 @@ def __getitem__(self, key): "sympy", # idaes.core.util.expr_doc "matplotlib", "click>=8", + "flexparser!=0.4", ], entry_points={ "console_scripts": [ From 36d00bf9aaa427b13d0deb7a91f06b35fcff4d96 Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Thu, 7 Nov 2024 10:22:38 -0700 Subject: [PATCH 04/10] Removing flexparser version bound --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index e7e7b6ccb4..43ad87f6ec 100644 --- a/setup.py +++ b/setup.py @@ -93,7 +93,6 @@ def __getitem__(self, key): "sympy", # idaes.core.util.expr_doc "matplotlib", "click>=8", - "flexparser!=0.4", ], entry_points={ "console_scripts": [ From df09525e85a237e4d2d6f94b5739e5b45db8d785 Mon Sep 17 00:00:00 2001 From: John Siirola Date: Fri, 8 Nov 2024 12:26:29 -0700 Subject: [PATCH 05/10] Bump Pyomo tag --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 43ad87f6ec..e43e538c82 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,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.8.0.idaes.2024.11.06.zip", + "pyomo @ https://github.com/IDAES/pyomo/archive/6.8.0.idaes.2024.11.08.zip", "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", From df416de78387e752c22de0a9bf211c01b8572fca Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Mon, 11 Nov 2024 14:22:52 -0700 Subject: [PATCH 06/10] Bump Pyomo tag --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e43e538c82..5ac3d15115 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,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.8.0.idaes.2024.11.08.zip", + "pyomo @ https://github.com/IDAES/pyomo/archive/6.8.0.idaes.2024.11.11.zip", "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", From 01d69c0d4c4ce2942b74376312cc6c1e39c24086 Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Fri, 15 Nov 2024 08:41:14 -0700 Subject: [PATCH 07/10] Bumping Pyomo tag again --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5ac3d15115..b4b094b62f 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,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.8.0.idaes.2024.11.11.zip", + "pyomo @ https://github.com/IDAES/pyomo/archive/6.8.0.idaes.2024.11.15.zip", "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", From a44b9922803b93ba1c4e505db833a2b284929d61 Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Fri, 15 Nov 2024 15:57:38 -0700 Subject: [PATCH 08/10] Bumping Pyomo to the latest release --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b4b094b62f..d5aa8600d9 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,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.8.0.idaes.2024.11.15.zip", + "pyomo >= 6.8.1", "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", From 3c9379408b926ff043d7cf8dfeddb7ccf789bbd1 Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Mon, 18 Nov 2024 12:28:34 -0700 Subject: [PATCH 09/10] Bumping Pyomo tag --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d5aa8600d9..7faf4eadd6 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,7 @@ def __getitem__(self, key): # Put abstract (non-versioned) deps here. # Concrete dependencies go in requirements[-dev].txt install_requires=[ - "pyomo >= 6.8.1", + "pyomo @ https://github.com/IDAES/pyomo/archive/6.8.1.idaes.2024.11.18.zip", "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", From 19247a14ea7eb0a6de089f53a883307fa8afbdf6 Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Mon, 18 Nov 2024 21:32:17 -0600 Subject: [PATCH 10/10] Update pyomo requirement to to 6.8.2 release --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7faf4eadd6..506b6212d6 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,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.8.1.idaes.2024.11.18.zip", + "pyomo >= 6.8.2", "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",