Skip to content

Commit 390dab3

Browse files
authored
Sync requirements.txt for all images and update Postgres versions to latest minors to fix builds (#155)
Bake new images for citusdata/citus#7491. We also update Postgres minor versions to resolve build issues that happens due to some portion of images assuming that we're always using latest minors --regardless of what circleci/images/PG_VERSIONS says, see https://github.com/citusdata/the-process/actions/runs/7928205849/job/21646015823#step:4:1061.
1 parent 19b671f commit 390dab3

6 files changed

Lines changed: 102 additions & 97 deletions

File tree

circleci/images/PG_VERSIONS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
PG14=14.10
2-
PG15=15.5
3-
PG16=16.1
1+
PG14=14.11
2+
PG15=15.6
3+
PG16=16.2

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

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,56 @@
1-
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7111
1+
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7491
22
# using `pipenv requirements > requirements.txt`, so as to avoid the
33
# need for pipenv/pyenv in this image
44

55
-i https://pypi.python.org/simple
66
asgiref==3.4.1; python_version >= '3.6'
77
blinker==1.4
88
brotli==1.0.9
9-
certifi==2023.7.22; python_version >= '3.6'
10-
cffi==1.15.1
9+
certifi==2024.2.2; python_version >= '3.6'
10+
cffi==1.16.0; platform_python_implementation != 'PyPy'
1111
click==8.0.4; python_version >= '3.6'
1212
construct==2.9.45
13-
cryptography==41.0.4; python_version >= '3.7'
13+
cryptography==42.0.3; python_version >= '3.7'
1414
docopt==0.6.2
15-
exceptiongroup==1.1.3; python_version < '3.11'
15+
exceptiongroup==1.2.0; python_version < '3.11'
1616
execnet==2.0.2; python_version >= '3.7'
17-
filelock==3.12.4; python_version >= '3.8'
17+
filelock==3.13.1; python_version >= '3.8'
1818
flask==2.0.3; python_version >= '3.6'
1919
h11==0.12.0; python_version >= '3.6'
2020
h2==4.1.0; python_full_version >= '3.6.1'
2121
hpack==4.0.0; python_full_version >= '3.6.1'
2222
hyperframe==6.0.1; python_full_version >= '3.6.1'
2323
iniconfig==2.0.0; python_version >= '3.7'
2424
itsdangerous==2.1.2; python_version >= '3.7'
25-
jinja2==3.1.2; python_version >= '3.7'
25+
jinja2==3.1.3; python_version >= '3.7'
2626
kaitaistruct==0.9
2727
ldap3==2.9.1
28-
markupsafe==2.1.3; python_version >= '3.7'
28+
markupsafe==2.1.5; python_version >= '3.7'
2929
-e git+https://github.com/citusdata/mitmproxy.git@2fd18ef051b987925a36337ab1d61aa674353b44#egg=mitmproxy
30-
msgpack==1.0.6; python_version >= '3.8'
31-
packaging==23.1; python_version >= '3.7'
30+
msgpack==1.0.7; python_version >= '3.8'
31+
packaging==23.2; python_version >= '3.7'
3232
passlib==1.7.4
33-
pluggy==1.3.0; python_version >= '3.8'
33+
pluggy==1.4.0; python_version >= '3.8'
3434
protobuf==3.18.3; python_version >= '3.5'
35-
psycopg==3.1.11; python_version >= '3.7'
35+
psycopg==3.1.18; python_version >= '3.7'
3636
publicsuffix2==2.20191221
37-
pyasn1==0.5.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
37+
pyasn1==0.5.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
3838
pycparser==2.21
39-
pyopenssl==23.2.0; python_version >= '3.6'
39+
pyopenssl==24.0.0; python_version >= '3.7'
4040
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
4141
pyperclip==1.8.2
42-
pytest==7.4.2; python_version >= '3.7'
43-
pytest-asyncio==0.21.1; python_version >= '3.7'
44-
pytest-repeat==0.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
45-
pytest-timeout==2.1.0; python_version >= '3.6'
46-
pytest-xdist==3.3.1; python_version >= '3.7'
42+
pytest==8.0.0; python_version >= '3.8'
43+
pytest-asyncio==0.23.5; python_version >= '3.8'
44+
pytest-repeat==0.9.3; python_version >= '3.7'
45+
pytest-timeout==2.2.0; python_version >= '3.7'
46+
pytest-xdist==3.5.0; python_version >= '3.7'
4747
pyyaml==6.0.1; python_version >= '3.6'
4848
ruamel.yaml==0.17.16; python_version >= '3'
49+
ruamel.yaml.clib==0.2.8; python_version < '3.10' and platform_python_implementation == 'CPython'
4950
sortedcontainers==2.4.0
5051
tomli==2.0.1; python_version < '3.11'
51-
tornado==6.3.3; python_version >= '3.8'
52-
typing-extensions==4.8.0; python_version >= '3.8'
52+
tornado==6.4; python_version >= '3.8'
53+
typing-extensions==4.9.0; python_version >= '3.8'
5354
urwid==2.1.2
5455
werkzeug==2.3.7; python_version >= '3.8'
5556
wsproto==1.0.0; python_full_version >= '3.6.1'

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

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,56 @@
1-
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7111
1+
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7491
22
# using `pipenv requirements > requirements.txt`, so as to avoid the
33
# need for pipenv/pyenv in this image
44

55
-i https://pypi.python.org/simple
66
asgiref==3.4.1; python_version >= '3.6'
77
blinker==1.4
88
brotli==1.0.9
9-
certifi==2023.7.22; python_version >= '3.6'
10-
cffi==1.15.1
9+
certifi==2024.2.2; python_version >= '3.6'
10+
cffi==1.16.0; platform_python_implementation != 'PyPy'
1111
click==8.0.4; python_version >= '3.6'
1212
construct==2.9.45
13-
cryptography==41.0.4; python_version >= '3.7'
13+
cryptography==42.0.3; python_version >= '3.7'
1414
docopt==0.6.2
15-
exceptiongroup==1.1.3; python_version < '3.11'
15+
exceptiongroup==1.2.0; python_version < '3.11'
1616
execnet==2.0.2; python_version >= '3.7'
17-
filelock==3.12.4; python_version >= '3.8'
17+
filelock==3.13.1; python_version >= '3.8'
1818
flask==2.0.3; python_version >= '3.6'
1919
h11==0.12.0; python_version >= '3.6'
2020
h2==4.1.0; python_full_version >= '3.6.1'
2121
hpack==4.0.0; python_full_version >= '3.6.1'
2222
hyperframe==6.0.1; python_full_version >= '3.6.1'
2323
iniconfig==2.0.0; python_version >= '3.7'
2424
itsdangerous==2.1.2; python_version >= '3.7'
25-
jinja2==3.1.2; python_version >= '3.7'
25+
jinja2==3.1.3; python_version >= '3.7'
2626
kaitaistruct==0.9
2727
ldap3==2.9.1
28-
markupsafe==2.1.3; python_version >= '3.7'
28+
markupsafe==2.1.5; python_version >= '3.7'
2929
-e git+https://github.com/citusdata/mitmproxy.git@2fd18ef051b987925a36337ab1d61aa674353b44#egg=mitmproxy
30-
msgpack==1.0.6; python_version >= '3.8'
31-
packaging==23.1; python_version >= '3.7'
30+
msgpack==1.0.7; python_version >= '3.8'
31+
packaging==23.2; python_version >= '3.7'
3232
passlib==1.7.4
33-
pluggy==1.3.0; python_version >= '3.8'
33+
pluggy==1.4.0; python_version >= '3.8'
3434
protobuf==3.18.3; python_version >= '3.5'
35-
psycopg==3.1.11; python_version >= '3.7'
35+
psycopg==3.1.18; python_version >= '3.7'
3636
publicsuffix2==2.20191221
37-
pyasn1==0.5.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
37+
pyasn1==0.5.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
3838
pycparser==2.21
39-
pyopenssl==23.2.0; python_version >= '3.6'
39+
pyopenssl==24.0.0; python_version >= '3.7'
4040
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
4141
pyperclip==1.8.2
42-
pytest==7.4.2; python_version >= '3.7'
43-
pytest-asyncio==0.21.1; python_version >= '3.7'
44-
pytest-repeat==0.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
45-
pytest-timeout==2.1.0; python_version >= '3.6'
46-
pytest-xdist==3.3.1; python_version >= '3.7'
42+
pytest==8.0.0; python_version >= '3.8'
43+
pytest-asyncio==0.23.5; python_version >= '3.8'
44+
pytest-repeat==0.9.3; python_version >= '3.7'
45+
pytest-timeout==2.2.0; python_version >= '3.7'
46+
pytest-xdist==3.5.0; python_version >= '3.7'
4747
pyyaml==6.0.1; python_version >= '3.6'
4848
ruamel.yaml==0.17.16; python_version >= '3'
49+
ruamel.yaml.clib==0.2.8; python_version < '3.10' and platform_python_implementation == 'CPython'
4950
sortedcontainers==2.4.0
5051
tomli==2.0.1; python_version < '3.11'
51-
tornado==6.3.3; python_version >= '3.8'
52-
typing-extensions==4.8.0; python_version >= '3.8'
52+
tornado==6.4; python_version >= '3.8'
53+
typing-extensions==4.9.0; python_version >= '3.8'
5354
urwid==2.1.2
5455
werkzeug==2.3.7; python_version >= '3.8'
5556
wsproto==1.0.0; python_full_version >= '3.6.1'

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

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,56 @@
1-
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7111
1+
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7491
22
# using `pipenv requirements > requirements.txt`, so as to avoid the
33
# need for pipenv/pyenv in this image
44

55
-i https://pypi.python.org/simple
66
asgiref==3.4.1; python_version >= '3.6'
77
blinker==1.4
88
brotli==1.0.9
9-
certifi==2023.7.22; python_version >= '3.6'
10-
cffi==1.15.1
9+
certifi==2024.2.2; python_version >= '3.6'
10+
cffi==1.16.0; platform_python_implementation != 'PyPy'
1111
click==8.0.4; python_version >= '3.6'
1212
construct==2.9.45
13-
cryptography==41.0.4; python_version >= '3.7'
13+
cryptography==42.0.3; python_version >= '3.7'
1414
docopt==0.6.2
15-
exceptiongroup==1.1.3; python_version < '3.11'
15+
exceptiongroup==1.2.0; python_version < '3.11'
1616
execnet==2.0.2; python_version >= '3.7'
17-
filelock==3.12.4; python_version >= '3.8'
17+
filelock==3.13.1; python_version >= '3.8'
1818
flask==2.0.3; python_version >= '3.6'
1919
h11==0.12.0; python_version >= '3.6'
2020
h2==4.1.0; python_full_version >= '3.6.1'
2121
hpack==4.0.0; python_full_version >= '3.6.1'
2222
hyperframe==6.0.1; python_full_version >= '3.6.1'
2323
iniconfig==2.0.0; python_version >= '3.7'
2424
itsdangerous==2.1.2; python_version >= '3.7'
25-
jinja2==3.1.2; python_version >= '3.7'
25+
jinja2==3.1.3; python_version >= '3.7'
2626
kaitaistruct==0.9
2727
ldap3==2.9.1
28-
markupsafe==2.1.3; python_version >= '3.7'
28+
markupsafe==2.1.5; python_version >= '3.7'
2929
-e git+https://github.com/citusdata/mitmproxy.git@2fd18ef051b987925a36337ab1d61aa674353b44#egg=mitmproxy
30-
msgpack==1.0.6; python_version >= '3.8'
31-
packaging==23.1; python_version >= '3.7'
30+
msgpack==1.0.7; python_version >= '3.8'
31+
packaging==23.2; python_version >= '3.7'
3232
passlib==1.7.4
33-
pluggy==1.3.0; python_version >= '3.8'
33+
pluggy==1.4.0; python_version >= '3.8'
3434
protobuf==3.18.3; python_version >= '3.5'
35-
psycopg==3.1.11; python_version >= '3.7'
35+
psycopg==3.1.18; python_version >= '3.7'
3636
publicsuffix2==2.20191221
37-
pyasn1==0.5.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
37+
pyasn1==0.5.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
3838
pycparser==2.21
39-
pyopenssl==23.2.0; python_version >= '3.6'
39+
pyopenssl==24.0.0; python_version >= '3.7'
4040
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
4141
pyperclip==1.8.2
42-
pytest==7.4.2; python_version >= '3.7'
43-
pytest-asyncio==0.21.1; python_version >= '3.7'
44-
pytest-repeat==0.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
45-
pytest-timeout==2.1.0; python_version >= '3.6'
46-
pytest-xdist==3.3.1; python_version >= '3.7'
42+
pytest==8.0.0; python_version >= '3.8'
43+
pytest-asyncio==0.23.5; python_version >= '3.8'
44+
pytest-repeat==0.9.3; python_version >= '3.7'
45+
pytest-timeout==2.2.0; python_version >= '3.7'
46+
pytest-xdist==3.5.0; python_version >= '3.7'
4747
pyyaml==6.0.1; python_version >= '3.6'
4848
ruamel.yaml==0.17.16; python_version >= '3'
49+
ruamel.yaml.clib==0.2.8; python_version < '3.10' and platform_python_implementation == 'CPython'
4950
sortedcontainers==2.4.0
5051
tomli==2.0.1; python_version < '3.11'
51-
tornado==6.3.3; python_version >= '3.8'
52-
typing-extensions==4.8.0; python_version >= '3.8'
52+
tornado==6.4; python_version >= '3.8'
53+
typing-extensions==4.9.0; python_version >= '3.8'
5354
urwid==2.1.2
5455
werkzeug==2.3.7; python_version >= '3.8'
5556
wsproto==1.0.0; python_full_version >= '3.6.1'

circleci/images/stylechecker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@ RUN apk add --no-cache --virtual installdeps \
3838
&& make install \
3939
&& cd ../.. \
4040
&& rm -rf uncrustify-uncrustify-0.68.1/ \
41-
&& pip3 install -Ir /tmp/etc/requirements.txt \
41+
# this image is only used for testing purposes, so should be okay to overwrite system-managed packages
42+
&& pip3 install -Ir /tmp/etc/requirements.txt --break-system-packages \
4243
&& apk del installdeps

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

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,67 @@
1-
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7111
1+
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7491
22
# using `pipenv requirements --dev > requirements.txt`, so as to avoid the
33
# need for pipenv/pyenv in this image
44

55
-i https://pypi.python.org/simple
6-
attrs==23.1.0; python_version >= '3.7'
7-
black==23.9.1; python_version >= '3.8'
6+
attrs==23.2.0; python_version >= '3.7'
7+
black==24.2.0; python_version >= '3.8'
88
click==8.0.4; python_version >= '3.6'
9-
flake8==6.1.0; python_full_version >= '3.8.1'
10-
flake8-bugbear==23.9.16; python_full_version >= '3.8.1'
11-
isort==5.12.0; python_full_version >= '3.8.0'
9+
flake8==7.0.0; python_full_version >= '3.8.1'
10+
flake8-bugbear==24.2.6; python_full_version >= '3.8.1'
11+
isort==5.13.2; python_full_version >= '3.8.0'
1212
mccabe==0.7.0; python_version >= '3.6'
1313
mypy-extensions==1.0.0; python_version >= '3.5'
14-
packaging==23.1; python_version >= '3.7'
15-
pathspec==0.11.2; python_version >= '3.7'
16-
platformdirs==3.10.0; python_version >= '3.7'
17-
pycodestyle==2.11.0; python_version >= '3.8'
18-
pyflakes==3.1.0; python_version >= '3.8'
14+
packaging==23.2; python_version >= '3.7'
15+
pathspec==0.12.1; python_version >= '3.8'
16+
platformdirs==4.2.0; python_version >= '3.8'
17+
pycodestyle==2.11.1; python_version >= '3.8'
18+
pyflakes==3.2.0; python_version >= '3.8'
1919
tomli==2.0.1; python_version < '3.11'
20-
typing-extensions==4.8.0; python_version >= '3.8'
20+
typing-extensions==4.9.0; python_version >= '3.8'
2121
asgiref==3.4.1; python_version >= '3.6'
2222
blinker==1.4
2323
brotli==1.0.9
24-
certifi==2023.7.22; python_version >= '3.6'
25-
cffi==1.15.1
24+
certifi==2024.2.2; python_version >= '3.6'
25+
cffi==1.16.0; platform_python_implementation != 'PyPy'
2626
construct==2.9.45
27-
cryptography==41.0.4; python_version >= '3.7'
27+
cryptography==42.0.3; python_version >= '3.7'
2828
docopt==0.6.2
29-
exceptiongroup==1.1.3; python_version < '3.11'
29+
exceptiongroup==1.2.0; python_version < '3.11'
3030
execnet==2.0.2; python_version >= '3.7'
31-
filelock==3.12.4; python_version >= '3.8'
31+
filelock==3.13.1; python_version >= '3.8'
3232
flask==2.0.3; python_version >= '3.6'
3333
h11==0.12.0; python_version >= '3.6'
3434
h2==4.1.0; python_full_version >= '3.6.1'
3535
hpack==4.0.0; python_full_version >= '3.6.1'
3636
hyperframe==6.0.1; python_full_version >= '3.6.1'
3737
iniconfig==2.0.0; python_version >= '3.7'
3838
itsdangerous==2.1.2; python_version >= '3.7'
39-
jinja2==3.1.2; python_version >= '3.7'
39+
jinja2==3.1.3; python_version >= '3.7'
4040
kaitaistruct==0.9
4141
ldap3==2.9.1
42-
markupsafe==2.1.3; python_version >= '3.7'
42+
markupsafe==2.1.5; python_version >= '3.7'
4343
-e git+https://github.com/citusdata/mitmproxy.git@2fd18ef051b987925a36337ab1d61aa674353b44#egg=mitmproxy
44-
msgpack==1.0.6; python_version >= '3.8'
44+
msgpack==1.0.7; python_version >= '3.8'
4545
passlib==1.7.4
46-
pluggy==1.3.0; python_version >= '3.8'
46+
pluggy==1.4.0; python_version >= '3.8'
4747
protobuf==3.18.3; python_version >= '3.5'
48-
psycopg==3.1.11; python_version >= '3.7'
48+
psycopg==3.1.18; python_version >= '3.7'
4949
publicsuffix2==2.20191221
50-
pyasn1==0.5.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
50+
pyasn1==0.5.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
5151
pycparser==2.21
52-
pyopenssl==23.2.0; python_version >= '3.6'
52+
pyopenssl==24.0.0; python_version >= '3.7'
5353
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
5454
pyperclip==1.8.2
55-
pytest==7.4.2; python_version >= '3.7'
56-
pytest-asyncio==0.21.1; python_version >= '3.7'
57-
pytest-repeat==0.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
58-
pytest-timeout==2.1.0; python_version >= '3.6'
59-
pytest-xdist==3.3.1; python_version >= '3.7'
55+
pytest==8.0.0; python_version >= '3.8'
56+
pytest-asyncio==0.23.5; python_version >= '3.8'
57+
pytest-repeat==0.9.3; python_version >= '3.7'
58+
pytest-timeout==2.2.0; python_version >= '3.7'
59+
pytest-xdist==3.5.0; python_version >= '3.7'
6060
pyyaml==6.0.1; python_version >= '3.6'
6161
ruamel.yaml==0.17.16; python_version >= '3'
62+
ruamel.yaml.clib==0.2.8; python_version < '3.10' and platform_python_implementation == 'CPython'
6263
sortedcontainers==2.4.0
63-
tornado==6.3.3; python_version >= '3.8'
64+
tornado==6.4; python_version >= '3.8'
6465
urwid==2.1.2
6566
werkzeug==2.3.7; python_version >= '3.8'
6667
wsproto==1.0.0; python_full_version >= '3.6.1'

0 commit comments

Comments
 (0)