Merge branch 'master' of https://github.com/baobabsoluciones/cornflow …

…into development
baobabsoluciones · Oct 4, 2023 · 99905fe · 99905fe
2 parents 4e920a4 + ea5702b
commit 99905fe
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 6 deletions.
diff --git a/cornflow-server/Dockerfile b/cornflow-server/Dockerfile
@@ -9,7 +9,7 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV TERM linux
 
 # CORNFLOW vars
-ARG CORNFLOW_VERSION=1.0.4
+ARG CORNFLOW_VERSION=1.0.7
 
 # install linux pkg
 RUN apt update -y && apt-get install -y --no-install-recommends \

diff --git a/cornflow-server/changelog.rst b/cornflow-server/changelog.rst
@@ -1,3 +1,23 @@
+version 1.0.7
+--------------
+
+- released: 2023-10-03
+- description: security version of cornflow to update vulnerability on dependency
+- changelog:
+    - updated version of gevent to 23.9.0.post1 due to security reasons.
+
+version 1.0.5
+--------------
+
+- released: 2023-05-04
+- description: first version of cornflow without cornflow core
+- changelog:
+    - removed cornflow core from dependencies.
+    - moved all cornflow core code to cornflow.
+    - added new error handling for InternalServerErrors.
+    - updated version of flask to 2.3.2 due to security reasons.
+    - updated version of other libraries due to upgrade on flask version.
+
 version 1.0.4
 ---------------
 

diff --git a/cornflow-server/requirements.txt b/cornflow-server/requirements.txt
@@ -1,7 +1,7 @@
 alembic==1.9.2
 apispec<=6.2.0
 click<=8.1.3
-cornflow-client<=1.0.12
+cornflow-client<=1.0.14
 cryptography<=39.0.2
 disposable-email-domains>=0.0.86
 Flask==2.3.2
@@ -13,7 +13,7 @@ flask-inflate<=0.3
 Flask-Migrate<=4.0.4
 Flask-RESTful<=0.3.9
 Flask-SQLAlchemy==2.5.1
-gevent<=22.10.2
+gevent==23.9.1
 greenlet<=2.0.2
 gunicorn<=20.1.0
 jsonpatch<=1.32

diff --git a/cornflow-server/setup.py b/cornflow-server/setup.py
@@ -9,7 +9,7 @@
 
 setuptools.setup(
     name="cornflow",
-    version="1.0.4",
+    version="1.0.7",
     author="baobab soluciones",
     author_email="[email protected]",
     description="Cornflow is an open source multi-solver optimization server with a REST API built using flask.",

diff --git a/libs/client/changelog.rst b/libs/client/changelog.rst
@@ -1,3 +1,20 @@
+version 1.0.14
+---------------
+
+- released: 2023-10-03
+- description: added pandas dependency due to ortools missing pandas as their own dependency
+- changelog:
+    - added pandas (>=1.5.2) dependency due to ortools missing pandas as their own dependency
+
+version 1.0.13
+---------------
+
+- released: 2023-05-04
+- description: bugfix on error handling in dag solving workflow
+- changelog:
+    - bugfix on error handling in dag solving workflow
+    - calls to cornflow now use the raw client.
+
 version 1.0.12
 ---------------
 

diff --git a/libs/client/requirements-dev.txt b/libs/client/requirements-dev.txt
@@ -1,4 +1,3 @@
 -r requirements.txt
 coverage
-pandas
 openpyxl
diff --git a/libs/client/requirements.txt b/libs/client/requirements.txt
@@ -4,4 +4,5 @@ jsonschema
 marshmallow
 pytups
 ortools
+pandas>=1.5.2
 PuLP>=2.3
diff --git a/libs/client/setup.py b/libs/client/setup.py
@@ -12,7 +12,7 @@
 
 setuptools.setup(
     name="cornflow-client",
-    version="1.0.12",
+    version="1.0.14",
     author="baobab soluciones",
     author_email="[email protected]",
     description="Client to connect to a cornflow server",