Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update Python to v3.11 #158

Merged
merged 2 commits into from
Nov 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
exit-code: '1'
failure-threshold: WARN
accept-keywords: key
accept-filenames: usr/share/cmake/Templates/Windows/Windows_TemporaryKey.pfx,etc/trusted-key.key,usr/share/doc/perl-IO-Socket-SSL/certs/server_enc.p12,usr/share/doc/perl-IO-Socket-SSL/certs/server.p12,usr/local/lib/python3.8/site-packages/azure/core/settings.py,usr/share/postgresql-common/pgdg/apt.postgresql.org.asc,usr/local/lib/python3.7/dist-packages/azure/core/settings.py,etc/ssl/private/ssl-cert-snakeoil.key
accept-filenames: usr/share/cmake/Templates/Windows/Windows_TemporaryKey.pfx,etc/trusted-key.key,usr/share/doc/perl-IO-Socket-SSL/certs/server_enc.p12,usr/share/doc/perl-IO-Socket-SSL/certs/server.p12,usr/share/postgresql-common/pgdg/apt.postgresql.org.asc,etc/ssl/private/ssl-cert-snakeoil.key,usr/local/lib/python3.11/site-packages/azure/core/settings.py

- name: Build and push
uses: docker/build-push-action@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
token: ${{ secrets.REPO_GHA_PAT }}
- uses: actions/setup-python@v4
with:
python-version: '3.8'
python-version: '3.11'
- name: Update docker-entrypoint
uses: nick-fields/retry@v2
with:
Expand Down
6 changes: 3 additions & 3 deletions UBI/11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ RUN --mount=type=secret,id=cs_token \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
6 changes: 3 additions & 3 deletions UBI/11/Dockerfile.multiarch
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ RUN --mount=type=secret,id=cs_token \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
6 changes: 3 additions & 3 deletions UBI/11/Dockerfile.multilang
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ RUN --mount=type=secret,id=cs_token \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
6 changes: 3 additions & 3 deletions UBI/11/Dockerfile.postgis
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ RUN set -xe ; \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
6 changes: 3 additions & 3 deletions UBI/11/Dockerfile.postgis-multilang
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ RUN set -xe ; \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
32 changes: 16 additions & 16 deletions UBI/11/root/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --generate-hashes
#
argcomplete==3.1.3 \
--hash=sha256:0ded993e146148e0fe4ebafd3563d56fbcd0adbe39bc3001b351739e599e9223 \
--hash=sha256:611c9d068f7a06e71d840d3bea59171aa7c927cb22c9a58557f74dc194f18b4d
argcomplete==3.1.4 \
--hash=sha256:72558ba729e4c468572609817226fb0a6e7e9a0a7d477b882be168c0b4a62b94 \
--hash=sha256:fbe56f8cda08aa9a04b307d8482ea703e96a6a801611acb4be9bf3942017989f
azure-core==1.29.5 \
--hash=sha256:0fa04b7b1f7d44a4fb8468c4093deb2ea01fdf4faddbf802ed9205615f99d68c \
--hash=sha256:52983c89d394c6f881a121e5101c5fa67278ca3b1f339c8fb2ef39230c70e9ac
Expand All @@ -25,12 +25,12 @@ barman[azure,cloud,google,snappy]==3.9.0 \
# via
# -r requirements.in
# barman
boto3==1.28.76 \
--hash=sha256:85e2fa361ad3210d30800bad311688261f2673a9b301e0edab56463d89609761 \
--hash=sha256:d18688bc5d688decf3cc404430a3ac3ec317be653cdcfbc51104c01f38a66434
botocore==1.31.76 \
--hash=sha256:479abb5a1ee03eb00faa1ea176bc595b2f46f7494777807681a9df45ed99ea18 \
--hash=sha256:74e0a4515d61b2860b24dc208ca89a68d79dc00147125d531746d3ba808822ad
boto3==1.28.78 \
--hash=sha256:aa970b1571321846543a6e615848352fe7621f1cb96b4454e919421924af95f7 \
--hash=sha256:ff8df4bb5aeb69acc64959a74b31042bfc52d64ca77dbe845a72c8062c48d179
botocore==1.31.78 \
--hash=sha256:320c70bc412157813c2cf60217a592b4b345f8e97e4bf3b1ce49b6be69ed8965 \
--hash=sha256:a9ca8deeb3f47a10a25637859fee8d81cac2db37ace819d24471279e44879547
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -331,9 +331,9 @@ jmespath==1.0.1 \
# via
# boto3
# botocore
msal==1.24.1 \
--hash=sha256:aa0972884b3c6fdec53d9a0bd15c12e5bd7b71ac1b66d746f54d128709f3f8f8 \
--hash=sha256:ce4320688f95c301ee74a4d0e9dbcfe029a63663a8cc61756f40d0d0d36574ad
msal==1.25.0 \
--hash=sha256:386df621becb506bc315a713ec3d4d5b5d6163116955c7dde23622f156b81af6 \
--hash=sha256:f44329fdb59f4f044c779164a34474b8a44ad9e4940afbc4c3a3a2bbe90324d9
# via
# azure-identity
# msal-extensions
Expand Down Expand Up @@ -464,9 +464,9 @@ typing-extensions==4.8.0 \
# via
# azure-core
# azure-storage-blob
urllib3==1.26.18 \
--hash=sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07 \
--hash=sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0
urllib3==2.0.7 \
--hash=sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84 \
--hash=sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e
# via
# botocore
# requests
6 changes: 3 additions & 3 deletions UBI/12/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ RUN --mount=type=secret,id=cs_token \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
6 changes: 3 additions & 3 deletions UBI/12/Dockerfile.multiarch
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ RUN --mount=type=secret,id=cs_token \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
6 changes: 3 additions & 3 deletions UBI/12/Dockerfile.multilang
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ RUN --mount=type=secret,id=cs_token \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
6 changes: 3 additions & 3 deletions UBI/12/Dockerfile.postgis
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ RUN set -xe ; \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
6 changes: 3 additions & 3 deletions UBI/12/Dockerfile.postgis-multilang
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ RUN set -xe ; \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
32 changes: 16 additions & 16 deletions UBI/12/root/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --generate-hashes
#
argcomplete==3.1.3 \
--hash=sha256:0ded993e146148e0fe4ebafd3563d56fbcd0adbe39bc3001b351739e599e9223 \
--hash=sha256:611c9d068f7a06e71d840d3bea59171aa7c927cb22c9a58557f74dc194f18b4d
argcomplete==3.1.4 \
--hash=sha256:72558ba729e4c468572609817226fb0a6e7e9a0a7d477b882be168c0b4a62b94 \
--hash=sha256:fbe56f8cda08aa9a04b307d8482ea703e96a6a801611acb4be9bf3942017989f
azure-core==1.29.5 \
--hash=sha256:0fa04b7b1f7d44a4fb8468c4093deb2ea01fdf4faddbf802ed9205615f99d68c \
--hash=sha256:52983c89d394c6f881a121e5101c5fa67278ca3b1f339c8fb2ef39230c70e9ac
Expand All @@ -25,12 +25,12 @@ barman[azure,cloud,google,snappy]==3.9.0 \
# via
# -r requirements.in
# barman
boto3==1.28.76 \
--hash=sha256:85e2fa361ad3210d30800bad311688261f2673a9b301e0edab56463d89609761 \
--hash=sha256:d18688bc5d688decf3cc404430a3ac3ec317be653cdcfbc51104c01f38a66434
botocore==1.31.76 \
--hash=sha256:479abb5a1ee03eb00faa1ea176bc595b2f46f7494777807681a9df45ed99ea18 \
--hash=sha256:74e0a4515d61b2860b24dc208ca89a68d79dc00147125d531746d3ba808822ad
boto3==1.28.78 \
--hash=sha256:aa970b1571321846543a6e615848352fe7621f1cb96b4454e919421924af95f7 \
--hash=sha256:ff8df4bb5aeb69acc64959a74b31042bfc52d64ca77dbe845a72c8062c48d179
botocore==1.31.78 \
--hash=sha256:320c70bc412157813c2cf60217a592b4b345f8e97e4bf3b1ce49b6be69ed8965 \
--hash=sha256:a9ca8deeb3f47a10a25637859fee8d81cac2db37ace819d24471279e44879547
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -331,9 +331,9 @@ jmespath==1.0.1 \
# via
# boto3
# botocore
msal==1.24.1 \
--hash=sha256:aa0972884b3c6fdec53d9a0bd15c12e5bd7b71ac1b66d746f54d128709f3f8f8 \
--hash=sha256:ce4320688f95c301ee74a4d0e9dbcfe029a63663a8cc61756f40d0d0d36574ad
msal==1.25.0 \
--hash=sha256:386df621becb506bc315a713ec3d4d5b5d6163116955c7dde23622f156b81af6 \
--hash=sha256:f44329fdb59f4f044c779164a34474b8a44ad9e4940afbc4c3a3a2bbe90324d9
# via
# azure-identity
# msal-extensions
Expand Down Expand Up @@ -464,9 +464,9 @@ typing-extensions==4.8.0 \
# via
# azure-core
# azure-storage-blob
urllib3==1.26.18 \
--hash=sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07 \
--hash=sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0
urllib3==2.0.7 \
--hash=sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84 \
--hash=sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e
# via
# botocore
# requests
6 changes: 3 additions & 3 deletions UBI/13/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ RUN --mount=type=secret,id=cs_token \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
6 changes: 3 additions & 3 deletions UBI/13/Dockerfile.multiarch
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ RUN --mount=type=secret,id=cs_token \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
6 changes: 3 additions & 3 deletions UBI/13/Dockerfile.multilang
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ RUN --mount=type=secret,id=cs_token \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
6 changes: 3 additions & 3 deletions UBI/13/Dockerfile.postgis
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ RUN set -xe ; \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
6 changes: 3 additions & 3 deletions UBI/13/Dockerfile.postgis-multilang
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ RUN set -xe ; \

# Install barman-cloud
RUN set -xe ; \
yum -y install python38-pip python38-psycopg2 ; \
pip3.8 install --upgrade pip ; \
pip3.8 install -r requirements.txt ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'

# make the sample config easier to munge (and "correct by default")
Expand Down
32 changes: 16 additions & 16 deletions UBI/13/root/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --generate-hashes
#
argcomplete==3.1.3 \
--hash=sha256:0ded993e146148e0fe4ebafd3563d56fbcd0adbe39bc3001b351739e599e9223 \
--hash=sha256:611c9d068f7a06e71d840d3bea59171aa7c927cb22c9a58557f74dc194f18b4d
argcomplete==3.1.4 \
--hash=sha256:72558ba729e4c468572609817226fb0a6e7e9a0a7d477b882be168c0b4a62b94 \
--hash=sha256:fbe56f8cda08aa9a04b307d8482ea703e96a6a801611acb4be9bf3942017989f
azure-core==1.29.5 \
--hash=sha256:0fa04b7b1f7d44a4fb8468c4093deb2ea01fdf4faddbf802ed9205615f99d68c \
--hash=sha256:52983c89d394c6f881a121e5101c5fa67278ca3b1f339c8fb2ef39230c70e9ac
Expand All @@ -25,12 +25,12 @@ barman[azure,cloud,google,snappy]==3.9.0 \
# via
# -r requirements.in
# barman
boto3==1.28.76 \
--hash=sha256:85e2fa361ad3210d30800bad311688261f2673a9b301e0edab56463d89609761 \
--hash=sha256:d18688bc5d688decf3cc404430a3ac3ec317be653cdcfbc51104c01f38a66434
botocore==1.31.76 \
--hash=sha256:479abb5a1ee03eb00faa1ea176bc595b2f46f7494777807681a9df45ed99ea18 \
--hash=sha256:74e0a4515d61b2860b24dc208ca89a68d79dc00147125d531746d3ba808822ad
boto3==1.28.78 \
--hash=sha256:aa970b1571321846543a6e615848352fe7621f1cb96b4454e919421924af95f7 \
--hash=sha256:ff8df4bb5aeb69acc64959a74b31042bfc52d64ca77dbe845a72c8062c48d179
botocore==1.31.78 \
--hash=sha256:320c70bc412157813c2cf60217a592b4b345f8e97e4bf3b1ce49b6be69ed8965 \
--hash=sha256:a9ca8deeb3f47a10a25637859fee8d81cac2db37ace819d24471279e44879547
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -331,9 +331,9 @@ jmespath==1.0.1 \
# via
# boto3
# botocore
msal==1.24.1 \
--hash=sha256:aa0972884b3c6fdec53d9a0bd15c12e5bd7b71ac1b66d746f54d128709f3f8f8 \
--hash=sha256:ce4320688f95c301ee74a4d0e9dbcfe029a63663a8cc61756f40d0d0d36574ad
msal==1.25.0 \
--hash=sha256:386df621becb506bc315a713ec3d4d5b5d6163116955c7dde23622f156b81af6 \
--hash=sha256:f44329fdb59f4f044c779164a34474b8a44ad9e4940afbc4c3a3a2bbe90324d9
# via
# azure-identity
# msal-extensions
Expand Down Expand Up @@ -464,9 +464,9 @@ typing-extensions==4.8.0 \
# via
# azure-core
# azure-storage-blob
urllib3==1.26.18 \
--hash=sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07 \
--hash=sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0
urllib3==2.0.7 \
--hash=sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84 \
--hash=sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e
# via
# botocore
# requests
Loading