From e5c5c52c27ebfe2856f9b69a1de5496074fd6777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= Date: Wed, 24 Nov 2021 17:23:50 +0100 Subject: [PATCH 1/2] Revert "fix(setup): setup.py: require `psycopg2-binary` instead of `psycopg2`" This reverts commit 0f84770064808cb23cc2b906958a614684e41fb6. --- CHANGELOG.md | 4 ---- VERSION | 2 +- requirements.txt | 23 +++++++++++------------ setup.py | 2 +- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 821f096..2398736 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,5 @@ # Changelog -## v4.0.3 (2021-11-18) -### Fixes -- setup.py: require `psycopg2-binary` instead of `psycopg2`. - ## v4.0.3 (2021-10-09) ### Fixes - Test python 3.10 in CI. diff --git a/VERSION b/VERSION index c5106e6..c4e41f9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.4 +4.0.3 diff --git a/requirements.txt b/requirements.txt index 44e0eea..9a7f046 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # # pip-compile --no-emit-index-url # -alembic==1.7.5 +alembic==1.7.4 # via chartreuse (setup.py) cachetools==4.2.4 # via google-auth @@ -12,27 +12,27 @@ certifi==2021.10.8 # via # kubernetes # requests -charset-normalizer==2.0.7 +charset-normalizer==2.0.6 # via requests -google-auth==2.3.3 +google-auth==2.3.0 # via kubernetes greenlet==1.1.2 # via sqlalchemy -idna==3.3 +idna==3.2 # via requests -importlib-metadata==4.8.2 +importlib-metadata==4.8.1 # via alembic -importlib-resources==5.4.0 +importlib-resources==5.2.2 # via alembic -kubernetes==19.15.0 +kubernetes==18.20.0 # via wiremind-kubernetes -mako==1.1.6 +mako==1.1.5 # via alembic markupsafe==2.0.1 # via mako oauthlib==3.1.1 # via requests-oauthlib -psycopg2-binary==2.9.2 +psycopg2==2.9.1 # via chartreuse (setup.py) pyasn1==0.4.8 # via @@ -42,7 +42,7 @@ pyasn1-modules==0.2.8 # via google-auth python-dateutil==2.8.2 # via kubernetes -pyyaml==6.0 +pyyaml==5.4.1 # via kubernetes requests==2.26.0 # via @@ -54,10 +54,9 @@ rsa==4.7.2 # via google-auth six==1.16.0 # via - # google-auth # kubernetes # python-dateutil -sqlalchemy==1.4.27 +sqlalchemy==1.4.25 # via alembic urllib3==1.26.7 # via diff --git a/setup.py b/setup.py index 0896f7a..eb697b7 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ python_requires=">=3.7.0", install_requires=[ "alembic==1.*", - "psycopg2-binary==2.*", + "psycopg2==2.*", "wiremind-kubernetes==6.*,>=6.3.5", ], extras_require={ From c26b36436560b77c224c657a3b0eed4b025376aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= Date: Wed, 24 Nov 2021 17:24:35 +0100 Subject: [PATCH 2/2] chore: bump version. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c4e41f9..7636e75 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.3 +4.0.5