Merge pull request #193 from OSeMOSYS/release-1.1

Release 1.1.0 Candidate
OSeMOSYS · Aug 30, 2023 · 87e5613 · 87e5613
2 parents 89baeed + 3692050
commit 87e5613
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,17 @@
 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
+- Locks pandas to <2.1
+
 Version 1.0.4
 =============
 - Fixed issue with pydantic v2.0.0

diff --git 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
@@ -47,7 +47,7 @@ install_requires =
     xlrd
     pyyaml
     pydot
-    pandas>=1.1
+    pandas>=1.1,<2.1
     Amply>=0.1.6
     networkx
     flatten_dict