Merge pull request #991 from vantage6/release/4.2

Release/4.2
vantage6 · Jan 19, 2024 · 0380363 · 0380363
2 parents bddd5ac + 7d9da18
commit 0380363
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 10 deletions.
diff --git a/docker/node-and-server.Dockerfile b/docker/node-and-server.Dockerfile
@@ -16,11 +16,9 @@ LABEL maintainer="Frank Martin <f.martin@iknl.nl>"
 RUN apt update -y
 RUN apt upgrade -y
 
-# TODO 2024-01-09 check if this custom install is still needed. It was used to
-# fix problems with the sqlalchemy dependency psycopg2 at some point.
 # # Fix DB issue
-# RUN apt install python-psycopg2 -y
-# RUN pip install psycopg2-binary
+RUN apt install python-psycopg2 -y
+RUN pip install psycopg2-binary
 
 # copy source
 COPY . /vantage6

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -1,6 +1,15 @@
 Release notes
 =============
 
+4.2.1
+-----
+
+*19 January 2024*
+
+- **Bugfix**
+ - Add back binary installation of ``psycopg2`` to support Postgres databases
+   (`PR#932 <https://github.com/vantage6/vantage6/pull/932>`_).
+
 4.2.0
 -----
 

diff --git a/vantage6-algorithm-tools/vantage6/algorithm/client/_version.py b/vantage6-algorithm-tools/vantage6/algorithm/client/_version.py
@@ -7,7 +7,7 @@
     __build__ = json.load(fp)
 
 # Module version
-version_info = (4, 2, 0, 'final', __build__, 0)
+version_info = (4, 2, 1, 'final', __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}

diff --git a/vantage6-client/vantage6/client/_version.py b/vantage6-client/vantage6/client/_version.py
@@ -7,7 +7,7 @@
     __build__ = json.load(fp)
 
 # Module version
-version_info = (4, 2, 0, 'final', __build__, 0)
+version_info = (4, 2, 1, 'final', __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}

diff --git a/vantage6-common/vantage6/common/_version.py b/vantage6-common/vantage6/common/_version.py
@@ -7,7 +7,7 @@
     __build__ = json.load(fp)
 
 # Module version
-version_info = (4, 2, 0, 'final', __build__, 0)
+version_info = (4, 2, 1, 'final', __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}

diff --git a/vantage6-node/vantage6/node/_version.py b/vantage6-node/vantage6/node/_version.py
@@ -7,7 +7,7 @@
     __build__ = json.load(fp)
 
 # Module version
-version_info = (4, 2, 0, 'final', __build__, 0)
+version_info = (4, 2, 1, 'final', __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}

diff --git a/vantage6-server/vantage6/server/_version.py b/vantage6-server/vantage6/server/_version.py
@@ -7,7 +7,7 @@
     __build__ = json.load(fp)
 
 # Module version
-version_info = (4, 2, 0, 'final', __build__, 0)
+version_info = (4, 2, 1, 'final', __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}

diff --git a/vantage6/vantage6/cli/_version.py b/vantage6/vantage6/cli/_version.py
@@ -7,7 +7,7 @@
     __build__ = json.load(fp)
 
 # Module version
-version_info = (4, 2, 0, 'final', __build__, 0)
+version_info = (4, 2, 1, 'final', __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}