From 9863389d899b73fc25f5cf2119fed26e418422cd Mon Sep 17 00:00:00 2001 From: Pierre-Etienne Bougue Date: Thu, 10 Aug 2023 17:59:35 +0200 Subject: [PATCH 1/2] Python2.7: pin psycopg2 to the version installed on our debian 8 images Otherwise, the build of images crashes. --- source/eitri/requirements.txt | 2 +- source/jormungandr/requirements.txt | 2 +- source/sql/requirements.txt | 2 +- source/tyr/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/eitri/requirements.txt b/source/eitri/requirements.txt index 26cf816d3f..5f895f4370 100644 --- a/source/eitri/requirements.txt +++ b/source/eitri/requirements.txt @@ -1,7 +1,7 @@ future==0.18.3 docker==3.4.1 retrying==1.3.3 -psycopg2==2.8.6 ; python_version < "3.9" +psycopg2==2.5.4 ; python_version < "3.9" # matching the version installed on our debian 8 images psycopg2-binary==2.9.7 ; python_version >= "3.9" GeoAlchemy2==0.2.4 SQLAlchemy==1.3.3 diff --git a/source/jormungandr/requirements.txt b/source/jormungandr/requirements.txt index b8964cc2fd..f1d86e6121 100644 --- a/source/jormungandr/requirements.txt +++ b/source/jormungandr/requirements.txt @@ -15,7 +15,7 @@ blinker==1.3 itsdangerous==1.1.0 protobuf==3.15.0 ; python_version < "3.9" protobuf==3.20.3 ; python_version >= "3.9" -psycopg2==2.8.6 ; python_version < "3.9" +psycopg2==2.5.4 ; python_version < "3.9" # matching the version installed on our debian 8 images psycopg2-binary==2.9.7 ; python_version >= "3.9" pyzmq==15.4.0 ; python_version < "3.9" pyzmq==25.0.2 ; python_version >= "3.9" diff --git a/source/sql/requirements.txt b/source/sql/requirements.txt index b2f1fba43a..e3256a6275 100644 --- a/source/sql/requirements.txt +++ b/source/sql/requirements.txt @@ -2,5 +2,5 @@ GeoAlchemy2==0.2.4 Mako==0.9.1 SQLAlchemy==1.3.3 alembic==1.0.11 -psycopg2==2.8.6 ; python_version < "3.9" +psycopg2==2.5.4 ; python_version < "3.9" # matching the version installed on our debian 8 images psycopg2-binary==2.9.7 ; python_version >= "3.9" diff --git a/source/tyr/requirements.txt b/source/tyr/requirements.txt index fda1f1d3ff..465e8526e6 100644 --- a/source/tyr/requirements.txt +++ b/source/tyr/requirements.txt @@ -21,7 +21,7 @@ itsdangerous==1.1.0 setuptools==44.1.0 ; python_version == "2.7" protobuf==3.15.0 ; python_version < "3.9" protobuf==3.20.3 ; python_version >= "3.9" -psycopg2==2.8.6 ; python_version < "3.9" +psycopg2==2.5.4 ; python_version < "3.9" # matching the version installed on our debian 8 images psycopg2-binary==2.9.7 ; python_version >= "3.9" pytz==2013.9 six==1.13.0 From b75c80b5c8ccee966ff5bdf0d444daa3be7f6cb2 Mon Sep 17 00:00:00 2001 From: Pierre-Etienne Bougue Date: Thu, 10 Aug 2023 18:02:02 +0200 Subject: [PATCH 2/2] On py2: keep psycopg2 version free As there is not a unanimous version OK for all plateforms (although the one really used in prod will be 2.5.4). --- source/eitri/requirements.txt | 2 +- source/jormungandr/requirements.txt | 2 +- source/sql/requirements.txt | 2 +- source/tyr/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/eitri/requirements.txt b/source/eitri/requirements.txt index 5f895f4370..88ddb6bf16 100644 --- a/source/eitri/requirements.txt +++ b/source/eitri/requirements.txt @@ -1,7 +1,7 @@ future==0.18.3 docker==3.4.1 retrying==1.3.3 -psycopg2==2.5.4 ; python_version < "3.9" # matching the version installed on our debian 8 images +psycopg2 ; python_version < "3.9" # keep it free: 2.5.4 is installed on debian 8 images, but doesn't handle PG 13.11 from debian 11 psycopg2-binary==2.9.7 ; python_version >= "3.9" GeoAlchemy2==0.2.4 SQLAlchemy==1.3.3 diff --git a/source/jormungandr/requirements.txt b/source/jormungandr/requirements.txt index f1d86e6121..cbc091fbbd 100644 --- a/source/jormungandr/requirements.txt +++ b/source/jormungandr/requirements.txt @@ -15,7 +15,7 @@ blinker==1.3 itsdangerous==1.1.0 protobuf==3.15.0 ; python_version < "3.9" protobuf==3.20.3 ; python_version >= "3.9" -psycopg2==2.5.4 ; python_version < "3.9" # matching the version installed on our debian 8 images +psycopg2 ; python_version < "3.9" # keep it free: 2.5.4 is installed on debian 8 images, but doesn't handle PG 13.11 from debian 11 psycopg2-binary==2.9.7 ; python_version >= "3.9" pyzmq==15.4.0 ; python_version < "3.9" pyzmq==25.0.2 ; python_version >= "3.9" diff --git a/source/sql/requirements.txt b/source/sql/requirements.txt index e3256a6275..a51beca9e0 100644 --- a/source/sql/requirements.txt +++ b/source/sql/requirements.txt @@ -2,5 +2,5 @@ GeoAlchemy2==0.2.4 Mako==0.9.1 SQLAlchemy==1.3.3 alembic==1.0.11 -psycopg2==2.5.4 ; python_version < "3.9" # matching the version installed on our debian 8 images +psycopg2 ; python_version < "3.9" # keep it free: 2.5.4 is installed on debian 8 images, but doesn't handle PG 13.11 from debian 11 psycopg2-binary==2.9.7 ; python_version >= "3.9" diff --git a/source/tyr/requirements.txt b/source/tyr/requirements.txt index 465e8526e6..e77b7a03eb 100644 --- a/source/tyr/requirements.txt +++ b/source/tyr/requirements.txt @@ -21,7 +21,7 @@ itsdangerous==1.1.0 setuptools==44.1.0 ; python_version == "2.7" protobuf==3.15.0 ; python_version < "3.9" protobuf==3.20.3 ; python_version >= "3.9" -psycopg2==2.5.4 ; python_version < "3.9" # matching the version installed on our debian 8 images +psycopg2 ; python_version < "3.9" # keep it free: 2.5.4 is installed on debian 8 images, but doesn't handle PG 13.11 from debian 11 psycopg2-binary==2.9.7 ; python_version >= "3.9" pytz==2013.9 six==1.13.0