From c212c13a4ab468ba61dd88c29322f889ca9ee150 Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Wed, 29 May 2024 13:29:15 -0600 Subject: [PATCH 1/5] Updating CHANGELOG in preparation for the 6.7.3 release --- CHANGELOG.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11b4ecbf785..b39165297f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ Pyomo CHANGELOG =============== +------------------------------------------------------------------------------- +Pyomo 6.7.3 (29 May 2024) +------------------------------------------------------------------------------- + +- Core + - Deprecate `pyomo.core.plugins.transform.model.to_standard_form()` (#3265) + - Reorder definitions to avoid `NameError` in some situations (#3264) +- Testing + - Add URL checking to GHA linting job (#3259, #3261) + - Skip Windows Python 3.8 conda GHA job (#3269) +- Contributed Packages + - DoE: Bug fixes for workshop (#3267) + ------------------------------------------------------------------------------- Pyomo 6.7.2 (9 May 2024) ------------------------------------------------------------------------------- @@ -57,7 +70,7 @@ Pyomo 6.7.2 (9 May 2024) - CP: Add SequenceVar and other logical expressions for scheduling (#3227) - DoE: Bug fixes (#3245) - iis: Add minimal intractable system infeasibility diagnostics (#3172) - - incidence_analysis: Improve `solve_strongly_connected_components` + - incidence_analysis: Improve `solve_strongly_connected_components` performance for models with named expressions (#3186) - incidence_analysis: Add function to plot incidence graph in Dulmage-Mendelsohn order (#3207) From 97a6ae08aa967a7aaa6fe9ef6e42bafe1eb29eca Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Wed, 29 May 2024 14:37:14 -0600 Subject: [PATCH 2/5] More edits to the CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b39165297f3..f9051e80ade 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ Pyomo 6.7.3 (29 May 2024) - Core - Deprecate `pyomo.core.plugins.transform.model.to_standard_form()` (#3265) - Reorder definitions to avoid `NameError` in some situations (#3264) +- Solver Interfaces + - NLv2: Fix linear presolver with constant defined vars/external fcns (#3276) - Testing - Add URL checking to GHA linting job (#3259, #3261) - Skip Windows Python 3.8 conda GHA job (#3269) From ba2d2cac411e0000bab03eb48b16bb0d573c2fed Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Wed, 29 May 2024 14:42:45 -0600 Subject: [PATCH 3/5] Updating deprecation version to 6.7.3 --- pyomo/core/plugins/transform/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyomo/core/plugins/transform/model.py b/pyomo/core/plugins/transform/model.py index 9f370c96304..8fe828854ce 100644 --- a/pyomo/core/plugins/transform/model.py +++ b/pyomo/core/plugins/transform/model.py @@ -24,7 +24,7 @@ @deprecated( "to_standard_form() is deprecated. " "Please use WriterFactory('compile_standard_form')", - version='6.7.3.dev0', + version='6.7.3', remove_in='6.8.0', ) def to_standard_form(self): From f12825eb98f96807cecbfc9515f41b2b8c0e9b16 Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Wed, 29 May 2024 15:14:28 -0600 Subject: [PATCH 4/5] More edits to the CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9051e80ade..8d1d1e45e3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ Pyomo 6.7.3 (29 May 2024) - Skip Windows Python 3.8 conda GHA job (#3269) - Contributed Packages - DoE: Bug fixes for workshop (#3267) + - viewer: Update guard for pint import (#3277) ------------------------------------------------------------------------------- Pyomo 6.7.2 (9 May 2024) From 93e5dab925115d564af09f8a33ff4099b0247083 Mon Sep 17 00:00:00 2001 From: John Siirola Date: Wed, 29 May 2024 15:23:21 -0600 Subject: [PATCH 5/5] Finalizing 6.7.3 release files --- .coin-or/projDesc.xml | 4 ++-- RELEASE.md | 2 +- pyomo/version/info.py | 4 ++-- setup.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.coin-or/projDesc.xml b/.coin-or/projDesc.xml index 073efd968a7..d13ac8804cf 100644 --- a/.coin-or/projDesc.xml +++ b/.coin-or/projDesc.xml @@ -227,8 +227,8 @@ Carl D. Laird, Chair, Pyomo Management Committee, claird at andrew dot cmu dot e Use explicit overrides to disable use of automated version reporting. --> - 6.7.2 - 6.7.2 + 6.7.3 + 6.7.3 diff --git a/RELEASE.md b/RELEASE.md index b0228e53944..e42469cbad5 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,4 +1,4 @@ -We are pleased to announce the release of Pyomo 6.7.2. +We are pleased to announce the release of Pyomo 6.7.3. Pyomo is a collection of Python software packages that supports a diverse set of optimization capabilities for formulating and analyzing diff --git a/pyomo/version/info.py b/pyomo/version/info.py index 36945e8e011..cba680d50ee 100644 --- a/pyomo/version/info.py +++ b/pyomo/version/info.py @@ -27,8 +27,8 @@ major = 6 minor = 7 micro = 3 -releaselevel = 'invalid' -# releaselevel = 'final' +# releaselevel = 'invalid' +releaselevel = 'final' serial = 0 if releaselevel == 'final': diff --git a/setup.py b/setup.py index 6d28e4d184b..9dfa253815e 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', # Needed by autodoc for pynumero + 'numpy<2.0.0', # Needed by autodoc for pynumero 'scipy', # Needed by autodoc for pynumero ], 'optional': [ @@ -273,7 +273,7 @@ def __ne__(self, other): # installed on python 3.8 'networkx<3.2; python_version<"3.9"', 'networkx; python_version>="3.9"', - 'numpy', + 'numpy<2.0.0', 'openpyxl', # dataportals #'pathos', # requested for #963, but PR currently closed 'pint', # units