Merge branch 'master' into develop

baobabsoluciones · Sep 18, 2024 · 542bb59 · 542bb59
2 parents 34a372d + 55a1710
commit 542bb59
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/cornflow-server/changelog.rst b/cornflow-server/changelog.rst
@@ -1,3 +1,14 @@
+version 1.1.1
+--------------
+
+- released: 2024-08-29
+- description: small security fixes
+- changelog:
+    - bump PuLP to version 2.9.0
+    - bump requests to version 2.32.3
+    - modified branch structure on repository.
+    - minor changes to documentation
+
 version 1.1.0
 --------------
 

diff --git a/cornflow-server/setup.py b/cornflow-server/setup.py
@@ -9,7 +9,7 @@
 
 setuptools.setup(
     name="cornflow",
-    version="1.1.0",
+    version="1.1.1",
     author="baobab soluciones",
     author_email="cornflow@baobabsoluciones.es",
     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,14 @@
+version 1.1.1
+--------------
+
+- released: 2024-08-29
+- description: small security fixes
+- changelog:
+    - bump PuLP to version 2.9.0
+    - bump requests to version 2.32.3
+    - modified branch structure on repository.
+    - minor changes to documentation
+
 version 1.1.0
 --------------
 

diff --git a/libs/client/setup.py b/libs/client/setup.py
@@ -12,7 +12,7 @@
 
 setuptools.setup(
     name="cornflow-client",
-    version="1.1.0",
+    version="1.1.1",
     author="baobab soluciones",
     author_email="sistemas@baobabsoluciones.es",
     description="Client to connect to a cornflow server",