From 1c7259c62ab08a0fe805e7b7548b0f1798420056 Mon Sep 17 00:00:00 2001 From: John Siirola Date: Tue, 30 May 2023 11:17:17 -0600 Subject: [PATCH 1/4] Updating changelog for 6.6.1 --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84d65a751ef..de8326d625f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,26 @@ Pyomo CHANGELOG =============== + +------------------------------------------------------------------------------- +Pyomo 6.6.1 (30 May 2023) +------------------------------------------------------------------------------- + +- General + - Update cmake builder for recent setuptools (#2847) + - Fixing minor formatting for 6.6.0 release changes (#2842) + - Silence deprecation warnings (#2854) +- Core + - Update indentation handling in `config.StringFormatter` (#2853) + - Restore slice API broken by #2829 (#2849) +- Solver Interfaces + - NL writer: resolve error identifying vars in indexed SOS (#2852) + - Manage Gurobi environments in GurobiDirect (#2680) +- Contributed Packages + - cp: fix handling fixed BooleanVars in logical-to-disjunctive walker (#2850) + - FBBT: Fix typo when handling GeneralExpression objects (#2848) + - MindtPy: add support for cyipopt (#2830) + ------------------------------------------------------------------------------- Pyomo 6.6.0 (24 May 2023) ------------------------------------------------------------------------------- From f0388e568aa71de82cc6c13ce6c57aa482ae6c4d Mon Sep 17 00:00:00 2001 From: John Siirola Date: Tue, 30 May 2023 11:18:03 -0600 Subject: [PATCH 2/4] Remove restriction on casadi dependency --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index ec41c38f115..071893a7ad3 100644 --- a/setup.py +++ b/setup.py @@ -264,9 +264,8 @@ def _print_deps(self, deplist): # install on PyPy (binary wheels are not available), so we # will only "require" them on other (CPython) platforms: # - # DAE can use casadi; as of 1 Nov 22, casadi has not been - # released for Python 3.11 - 'casadi; implementation_name!="pypy" and python_version<"3.11"', + # DAE can use casadi + 'casadi; implementation_name!="pypy"', 'numdifftools; implementation_name!="pypy"', # pynumero 'pandas; implementation_name!="pypy"', 'seaborn; implementation_name!="pypy"', # parmest.graphics From dff73e4018d5d2d3ad39c6d6cf11d3dd9385e7de Mon Sep 17 00:00:00 2001 From: John Siirola Date: Tue, 30 May 2023 11:19:42 -0600 Subject: [PATCH 3/4] Finalizing 6.6.1 release --- .coin-or/projDesc.xml | 4 ++-- RELEASE.md | 2 +- pyomo/version/info.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.coin-or/projDesc.xml b/.coin-or/projDesc.xml index c55e023b548..0c8942ea955 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.6.0 - 6.6.0 + 6.6.1 + 6.6.1 diff --git a/RELEASE.md b/RELEASE.md index 6f34462774e..53de39654c9 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,4 +1,4 @@ -We are pleased to announce the release of Pyomo 6.6.0. +We are pleased to announce the release of Pyomo 6.6.1. 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 5d182e3ae77..fdddc3f49e4 100644 --- a/pyomo/version/info.py +++ b/pyomo/version/info.py @@ -27,8 +27,8 @@ major = 6 minor = 6 micro = 1 -releaselevel = 'invalid' -# releaselevel = 'final' +# releaselevel = 'invalid' +releaselevel = 'final' serial = 0 if releaselevel == 'final': From 9e60667102c71789c33b8a6676bca968b52eeffc Mon Sep 17 00:00:00 2001 From: "Miranda Mundt (she/her)" <55767766+mrmundt@users.noreply.github.com> Date: Tue, 30 May 2023 13:22:59 -0600 Subject: [PATCH 4/4] Add last bugfix --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index de8326d625f..1bf751268fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ Pyomo 6.6.1 (30 May 2023) - Core - Update indentation handling in `config.StringFormatter` (#2853) - Restore slice API broken by #2829 (#2849) + - Resolve handling of {}**0 in `LinearRepn`/`QuadraticRepn` (#2857) - Solver Interfaces - NL writer: resolve error identifying vars in indexed SOS (#2852) - Manage Gurobi environments in GurobiDirect (#2680)