From 65f5dd861b37a33271a4047c9bcf612fd3ec8958 Mon Sep 17 00:00:00 2001 From: trevorb1 Date: Tue, 29 Aug 2023 05:41:36 -0700 Subject: [PATCH 1/4] changelog update --- CHANGELOG.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 970c3ea5..a782b270 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,16 @@ Changelog ========= +Version 1.1.0 +============= +- Public Python API added to call otoole directly in Python files +- ReadCplex directly reads in CPLEX solution files. Drops the need to transform and sort solution files +- ReadGlpk class added to process GLPK solution files +- Update to Pydantic v2.0 +- ReadResultsCbc renamed to ReadWideResults +- Model validation instructions updated in documentation +- The ``--input_datafile`` argument is deprecated, and the user now must supply the input data to process results + Version 1.0.4 ============= - Fixed issue with pydantic v2.0.0 From c2592bcc8195c8bec608c156dba20a38f718afd9 Mon Sep 17 00:00:00 2001 From: trevorb1 Date: Tue, 29 Aug 2023 05:43:03 -0700 Subject: [PATCH 2/4] update changelog --- CHANGELOG.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a782b270..c74d3730 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,10 +6,10 @@ Version 1.1.0 ============= - Public Python API added to call otoole directly in Python files - ReadCplex directly reads in CPLEX solution files. Drops the need to transform and sort solution files -- ReadGlpk class added to process GLPK solution files +- ReadGlpk class added to process GLPK solution files - Update to Pydantic v2.0 - ReadResultsCbc renamed to ReadWideResults -- Model validation instructions updated in documentation +- Model validation instructions updated in documentation - The ``--input_datafile`` argument is deprecated, and the user now must supply the input data to process results Version 1.0.4 From 386a114935cf041811cf945c035e2e1c7124cd1b Mon Sep 17 00:00:00 2001 From: trevorb1 Date: Tue, 29 Aug 2023 06:03:36 -0700 Subject: [PATCH 3/4] lock pandas <2.1 --- docs/requirements.txt | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 5e98bc20..6b659fb8 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -4,7 +4,7 @@ flatten_dict Jinja2<3.1 networkx openpyxl -pandas>=1.1 +pandas>=1.1,<2.1 pydantic>=2 pydot pyyaml diff --git a/setup.cfg b/setup.cfg index 1de641c8..7fbcbb43 100644 --- a/setup.cfg +++ b/setup.cfg @@ -47,7 +47,7 @@ install_requires = xlrd pyyaml pydot - pandas>=1.1 + pandas>=1.1,<2.1 Amply>=0.1.6 networkx flatten_dict From 3692050c9336f036b9b4f40f3c71f6b7431296b3 Mon Sep 17 00:00:00 2001 From: trevorb1 Date: Tue, 29 Aug 2023 06:18:58 -0700 Subject: [PATCH 4/4] update changelog --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c74d3730..54b51389 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,7 @@ Version 1.1.0 - ReadResultsCbc renamed to ReadWideResults - Model validation instructions updated in documentation - The ``--input_datafile`` argument is deprecated, and the user now must supply the input data to process results +- Locks pandas to <2.1 Version 1.0.4 =============