Skip to content

Commit 84f117d

Browse files
committed
corrected requirements + dockerfiles to use pythın 3.12
1 parent 02b64c9 commit 84f117d

File tree

4 files changed

+32
-35
lines changed

4 files changed

+32
-35
lines changed

circleci/images/citusupgradetester/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# we cannot easily upgrade to python 3.11 as our mitmproxy fork does not ship with it
2-
FROM python:3.10-slim-bullseye AS base
1+
FROM python:3.12-slim-bookworm AS base
32

43
# add unpriviliged user for tests
54
RUN useradd -ms /bin/bash circleci
@@ -56,8 +55,8 @@ set -eux
5655

5756
# install key and repositories
5857
curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
59-
echo "deb https://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
60-
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bullseye-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list
58+
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
59+
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bookworm-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list
6160

6261
apt-get update
6362

circleci/images/failtester/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# we cannot easily upgrade to python 3.11 as our mitmproxy fork does not ship with it
2-
FROM python:3.10-slim-bullseye
1+
FROM python:3.12-slim-bookworm
32

43
# add unpriviliged user for tests
54
RUN useradd -ms /bin/bash circleci
@@ -55,8 +54,8 @@ RUN <<'EOF'
5554

5655
# install key and repositories
5756
curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
58-
echo "deb https://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
59-
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bullseye-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list
57+
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
58+
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bookworm-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list
6059

6160
apt-get update
6261

circleci/images/pgupgradetester/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# we cannot easily upgrade to python 3.11 as our mitmproxy fork does not ship with it
2-
FROM python:3.10-slim-bullseye
1+
FROM python:3.12-slim-bookworm
32

43
# add unpriviliged user for tests
54
RUN useradd -ms /bin/bash circleci
@@ -56,8 +55,8 @@ set -eux
5655

5756
# install key and repositories
5857
curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
59-
echo "deb https://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
60-
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bullseye-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list
58+
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
59+
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bookworm-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list
6160

6261
apt-get update
6362

circleci/images/stylechecker/files/etc/requirements.txt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,35 @@ pathspec==0.12.1; python_version >= '3.8'
1616
platformdirs==4.5.1; python_version >= '3.10'
1717
pycodestyle==2.14.0; python_version >= '3.9'
1818
pyflakes==3.4.0; python_version >= '3.9'
19-
tomli==2.3.0; python_version >= '3.8'
20-
typing-extensions==4.11.0; python_version >= '3.8'
2119
aioquic==1.2.0; python_version >= '3.8'
22-
asgiref==3.8.1; python_version >= '3.8'
23-
backports-asyncio-runner==1.2.0; python_version < '3.11' and python_version >= '3.8'
20+
argon2-cffi==25.1.0; python_version >= '3.8'
21+
argon2-cffi-bindings==25.1.0; python_version >= '3.9'
22+
asgiref==3.10.0; python_version >= '3.9'
23+
bcrypt==5.0.0; python_version >= '3.8'
2424
blinker==1.9.0; python_version >= '3.9'
25-
brotli==1.1.0
25+
brotli==1.2.0
2626
certifi==2025.11.12; python_version >= '3.7'
2727
cffi==2.0.0; python_version >= '3.9'
2828
construct==2.10.70; python_version >= '3.6'
2929
cryptography==44.0.3; python_version >= '3.7' and python_full_version not in '3.9.0, 3.9.1'
3030
docopt==0.6.2
31-
exceptiongroup==1.3.1; python_version >= '3.7'
3231
execnet==2.1.2; python_version >= '3.8'
3332
filelock==3.20.1; python_version >= '3.10'
34-
flask==3.1.0; python_version >= '3.9'
35-
h11==0.14.0; python_version >= '3.7'
36-
h2==4.1.0; python_full_version >= '3.6.1'
33+
flask==3.1.2; python_version >= '3.9'
34+
h11==0.16.0; python_version >= '3.8'
35+
h2==4.3.0; python_version >= '3.9'
3736
hpack==4.1.0; python_version >= '3.9'
38-
hyperframe==6.0.1; python_full_version >= '3.6.1'
37+
hyperframe==6.1.0; python_version >= '3.9'
3938
iniconfig==2.3.0; python_version >= '3.10'
4039
itsdangerous==2.2.0; python_version >= '3.8'
4140
jinja2==3.1.6; python_version >= '3.7'
42-
kaitaistruct==0.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
41+
kaitaistruct==0.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
4342
ldap3==2.9.1
4443
markupsafe==3.0.3; python_version >= '3.9'
45-
mitmproxy==11.0.2; python_version >= '3.10'
46-
mitmproxy-rs==0.10.7; python_version >= '3.10'
47-
msgpack==1.1.0; python_version >= '3.8'
48-
passlib==1.7.4
44+
mitmproxy @ git+https://github.com/citusdata/mitmproxy.git@66594bb8af146cce8d9bd7f79f46b77785f3d699
45+
mitmproxy-linux==0.12.8; python_version >= '3.12'
46+
mitmproxy-rs==0.12.8; python_version >= '3.12'
47+
msgpack==1.1.2; python_version >= '3.9'
4948
pluggy==1.6.0; python_version >= '3.9'
5049
psycopg==3.3.2; python_version >= '3.10'
5150
publicsuffix2==2.20191221
@@ -54,22 +53,23 @@ pyasn1-modules==0.4.2; python_version >= '3.8'
5453
pycparser==2.23; python_version >= '3.8'
5554
pygments==2.19.2; python_version >= '3.8'
5655
pylsqpack==0.3.23; python_version >= '3.10'
57-
pyopenssl==24.3.0; python_version >= '3.7'
58-
pyparsing==3.2.0; python_version >= '3.9'
56+
pyopenssl==25.1.0; python_version >= '3.7'
57+
pyparsing==3.2.5; python_version >= '3.9'
5958
pyperclip==1.9.0
60-
pytest==8.4.2; python_version >= '3.9'
61-
pytest-asyncio==1.1.1; python_version >= '3.9'
59+
pytest==9.0.2; python_version >= '3.10'
60+
pytest-asyncio==1.3.0; python_version >= '3.10'
6261
pytest-repeat==0.9.4; python_version >= '3.9'
6362
pytest-timeout==2.4.0; python_version >= '3.7'
6463
pytest-xdist==3.8.0; python_version >= '3.9'
6564
pyyaml==6.0.3; python_version >= '3.8'
66-
ruamel.yaml==0.18.6; python_version >= '3.7'
65+
ruamel.yaml==0.18.16; python_version >= '3.8'
6766
ruamel.yaml.clib==0.2.15; python_version >= '3.9'
6867
service-identity==24.2.0; python_version >= '3.8'
6968
sortedcontainers==2.4.0
70-
tornado==6.4.2; python_version >= '3.8'
71-
urwid==2.6.16; python_version >= '3.8'
69+
tornado==6.5.2; python_version >= '3.9'
70+
typing-extensions==4.14.0; python_version >= '3.9'
71+
urwid==3.0.3; python_full_version >= '3.9.0'
7272
wcwidth==0.2.14; python_version >= '3.6'
7373
werkzeug==3.1.0; python_version >= '3.9'
7474
wsproto==1.2.0; python_full_version >= '3.7.0'
75-
zstandard==0.23.0; python_version >= '3.8'
75+
zstandard==0.25.0; python_version >= '3.9'

0 commit comments

Comments
 (0)