From d5e5136b317603f0fe0e25b1d31457e25388212f Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Thu, 9 May 2024 11:05:29 -0600 Subject: [PATCH 1/3] Unpinning numpy version requirement --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 2e8cf1d5095..a125b02b2fe 100644 --- a/setup.py +++ b/setup.py @@ -256,7 +256,7 @@ def __ne__(self, other): 'sphinx-toolbox>=2.16.0', 'sphinx-jinja2-compat>=0.1.1', 'enum_tools', - 'numpy<2.0.0', # Needed by autodoc for pynumero + 'numpy', # Needed by autodoc for pynumero 'scipy', # Needed by autodoc for pynumero ], 'optional': [ @@ -271,7 +271,7 @@ def __ne__(self, other): # installed on python 3.8 'networkx<3.2; python_version<"3.9"', 'networkx; python_version>="3.9"', - 'numpy<2.0.0', + 'numpy', 'openpyxl', # dataportals #'pathos', # requested for #963, but PR currently closed 'pint', # units From 167f2b14bf4c9d6a719f08a343128880bb04342c Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Thu, 9 May 2024 11:06:37 -0600 Subject: [PATCH 2/3] Resetting main for development (6.7.3.dev0) --- pyomo/version/info.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyomo/version/info.py b/pyomo/version/info.py index b3538ad5868..2d50dfe7b5e 100644 --- a/pyomo/version/info.py +++ b/pyomo/version/info.py @@ -26,9 +26,9 @@ # main and needs a hard reference to "suitably new" development. major = 6 minor = 7 -micro = 2 -# releaselevel = 'invalid' -releaselevel = 'final' +micro = 3 +releaselevel = 'invalid' +#releaselevel = 'final' serial = 0 if releaselevel == 'final': From 64a96147500cf0e71de8f955b3dfa92bf370799b Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Thu, 9 May 2024 11:10:11 -0600 Subject: [PATCH 3/3] Update info.py --- pyomo/version/info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyomo/version/info.py b/pyomo/version/info.py index 2d50dfe7b5e..36945e8e011 100644 --- a/pyomo/version/info.py +++ b/pyomo/version/info.py @@ -28,7 +28,7 @@ minor = 7 micro = 3 releaselevel = 'invalid' -#releaselevel = 'final' +# releaselevel = 'final' serial = 0 if releaselevel == 'final':