Skip to content

Commit

Permalink
Sync requirements.txt for all images and update Postgres versions to …
Browse files Browse the repository at this point in the history
…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.
  • Loading branch information
onurctirtir authored Feb 16, 2024
1 parent 19b671f commit 390dab3
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 97 deletions.
6 changes: 3 additions & 3 deletions circleci/images/PG_VERSIONS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
PG14=14.10
PG15=15.5
PG16=16.1
PG14=14.11
PG15=15.6
PG16=16.2
43 changes: 22 additions & 21 deletions circleci/images/citusupgradetester/files/etc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,55 +1,56 @@
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7111
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7491
# using `pipenv requirements > requirements.txt`, so as to avoid the
# need for pipenv/pyenv in this image

-i https://pypi.python.org/simple
asgiref==3.4.1; python_version >= '3.6'
blinker==1.4
brotli==1.0.9
certifi==2023.7.22; python_version >= '3.6'
cffi==1.15.1
certifi==2024.2.2; python_version >= '3.6'
cffi==1.16.0; platform_python_implementation != 'PyPy'
click==8.0.4; python_version >= '3.6'
construct==2.9.45
cryptography==41.0.4; python_version >= '3.7'
cryptography==42.0.3; python_version >= '3.7'
docopt==0.6.2
exceptiongroup==1.1.3; python_version < '3.11'
exceptiongroup==1.2.0; python_version < '3.11'
execnet==2.0.2; python_version >= '3.7'
filelock==3.12.4; python_version >= '3.8'
filelock==3.13.1; python_version >= '3.8'
flask==2.0.3; python_version >= '3.6'
h11==0.12.0; python_version >= '3.6'
h2==4.1.0; python_full_version >= '3.6.1'
hpack==4.0.0; python_full_version >= '3.6.1'
hyperframe==6.0.1; python_full_version >= '3.6.1'
iniconfig==2.0.0; python_version >= '3.7'
itsdangerous==2.1.2; python_version >= '3.7'
jinja2==3.1.2; python_version >= '3.7'
jinja2==3.1.3; python_version >= '3.7'
kaitaistruct==0.9
ldap3==2.9.1
markupsafe==2.1.3; python_version >= '3.7'
markupsafe==2.1.5; python_version >= '3.7'
-e git+https://github.com/citusdata/mitmproxy.git@2fd18ef051b987925a36337ab1d61aa674353b44#egg=mitmproxy
msgpack==1.0.6; python_version >= '3.8'
packaging==23.1; python_version >= '3.7'
msgpack==1.0.7; python_version >= '3.8'
packaging==23.2; python_version >= '3.7'
passlib==1.7.4
pluggy==1.3.0; python_version >= '3.8'
pluggy==1.4.0; python_version >= '3.8'
protobuf==3.18.3; python_version >= '3.5'
psycopg==3.1.11; python_version >= '3.7'
psycopg==3.1.18; python_version >= '3.7'
publicsuffix2==2.20191221
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'
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'
pycparser==2.21
pyopenssl==23.2.0; python_version >= '3.6'
pyopenssl==24.0.0; python_version >= '3.7'
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
pyperclip==1.8.2
pytest==7.4.2; python_version >= '3.7'
pytest-asyncio==0.21.1; python_version >= '3.7'
pytest-repeat==0.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
pytest-timeout==2.1.0; python_version >= '3.6'
pytest-xdist==3.3.1; python_version >= '3.7'
pytest==8.0.0; python_version >= '3.8'
pytest-asyncio==0.23.5; python_version >= '3.8'
pytest-repeat==0.9.3; python_version >= '3.7'
pytest-timeout==2.2.0; python_version >= '3.7'
pytest-xdist==3.5.0; python_version >= '3.7'
pyyaml==6.0.1; python_version >= '3.6'
ruamel.yaml==0.17.16; python_version >= '3'
ruamel.yaml.clib==0.2.8; python_version < '3.10' and platform_python_implementation == 'CPython'
sortedcontainers==2.4.0
tomli==2.0.1; python_version < '3.11'
tornado==6.3.3; python_version >= '3.8'
typing-extensions==4.8.0; python_version >= '3.8'
tornado==6.4; python_version >= '3.8'
typing-extensions==4.9.0; python_version >= '3.8'
urwid==2.1.2
werkzeug==2.3.7; python_version >= '3.8'
wsproto==1.0.0; python_full_version >= '3.6.1'
Expand Down
43 changes: 22 additions & 21 deletions circleci/images/failtester/files/etc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,55 +1,56 @@
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7111
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7491
# using `pipenv requirements > requirements.txt`, so as to avoid the
# need for pipenv/pyenv in this image

-i https://pypi.python.org/simple
asgiref==3.4.1; python_version >= '3.6'
blinker==1.4
brotli==1.0.9
certifi==2023.7.22; python_version >= '3.6'
cffi==1.15.1
certifi==2024.2.2; python_version >= '3.6'
cffi==1.16.0; platform_python_implementation != 'PyPy'
click==8.0.4; python_version >= '3.6'
construct==2.9.45
cryptography==41.0.4; python_version >= '3.7'
cryptography==42.0.3; python_version >= '3.7'
docopt==0.6.2
exceptiongroup==1.1.3; python_version < '3.11'
exceptiongroup==1.2.0; python_version < '3.11'
execnet==2.0.2; python_version >= '3.7'
filelock==3.12.4; python_version >= '3.8'
filelock==3.13.1; python_version >= '3.8'
flask==2.0.3; python_version >= '3.6'
h11==0.12.0; python_version >= '3.6'
h2==4.1.0; python_full_version >= '3.6.1'
hpack==4.0.0; python_full_version >= '3.6.1'
hyperframe==6.0.1; python_full_version >= '3.6.1'
iniconfig==2.0.0; python_version >= '3.7'
itsdangerous==2.1.2; python_version >= '3.7'
jinja2==3.1.2; python_version >= '3.7'
jinja2==3.1.3; python_version >= '3.7'
kaitaistruct==0.9
ldap3==2.9.1
markupsafe==2.1.3; python_version >= '3.7'
markupsafe==2.1.5; python_version >= '3.7'
-e git+https://github.com/citusdata/mitmproxy.git@2fd18ef051b987925a36337ab1d61aa674353b44#egg=mitmproxy
msgpack==1.0.6; python_version >= '3.8'
packaging==23.1; python_version >= '3.7'
msgpack==1.0.7; python_version >= '3.8'
packaging==23.2; python_version >= '3.7'
passlib==1.7.4
pluggy==1.3.0; python_version >= '3.8'
pluggy==1.4.0; python_version >= '3.8'
protobuf==3.18.3; python_version >= '3.5'
psycopg==3.1.11; python_version >= '3.7'
psycopg==3.1.18; python_version >= '3.7'
publicsuffix2==2.20191221
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'
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'
pycparser==2.21
pyopenssl==23.2.0; python_version >= '3.6'
pyopenssl==24.0.0; python_version >= '3.7'
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
pyperclip==1.8.2
pytest==7.4.2; python_version >= '3.7'
pytest-asyncio==0.21.1; python_version >= '3.7'
pytest-repeat==0.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
pytest-timeout==2.1.0; python_version >= '3.6'
pytest-xdist==3.3.1; python_version >= '3.7'
pytest==8.0.0; python_version >= '3.8'
pytest-asyncio==0.23.5; python_version >= '3.8'
pytest-repeat==0.9.3; python_version >= '3.7'
pytest-timeout==2.2.0; python_version >= '3.7'
pytest-xdist==3.5.0; python_version >= '3.7'
pyyaml==6.0.1; python_version >= '3.6'
ruamel.yaml==0.17.16; python_version >= '3'
ruamel.yaml.clib==0.2.8; python_version < '3.10' and platform_python_implementation == 'CPython'
sortedcontainers==2.4.0
tomli==2.0.1; python_version < '3.11'
tornado==6.3.3; python_version >= '3.8'
typing-extensions==4.8.0; python_version >= '3.8'
tornado==6.4; python_version >= '3.8'
typing-extensions==4.9.0; python_version >= '3.8'
urwid==2.1.2
werkzeug==2.3.7; python_version >= '3.8'
wsproto==1.0.0; python_full_version >= '3.6.1'
Expand Down
43 changes: 22 additions & 21 deletions circleci/images/pgupgradetester/files/etc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,55 +1,56 @@
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7111
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7491
# using `pipenv requirements > requirements.txt`, so as to avoid the
# need for pipenv/pyenv in this image

-i https://pypi.python.org/simple
asgiref==3.4.1; python_version >= '3.6'
blinker==1.4
brotli==1.0.9
certifi==2023.7.22; python_version >= '3.6'
cffi==1.15.1
certifi==2024.2.2; python_version >= '3.6'
cffi==1.16.0; platform_python_implementation != 'PyPy'
click==8.0.4; python_version >= '3.6'
construct==2.9.45
cryptography==41.0.4; python_version >= '3.7'
cryptography==42.0.3; python_version >= '3.7'
docopt==0.6.2
exceptiongroup==1.1.3; python_version < '3.11'
exceptiongroup==1.2.0; python_version < '3.11'
execnet==2.0.2; python_version >= '3.7'
filelock==3.12.4; python_version >= '3.8'
filelock==3.13.1; python_version >= '3.8'
flask==2.0.3; python_version >= '3.6'
h11==0.12.0; python_version >= '3.6'
h2==4.1.0; python_full_version >= '3.6.1'
hpack==4.0.0; python_full_version >= '3.6.1'
hyperframe==6.0.1; python_full_version >= '3.6.1'
iniconfig==2.0.0; python_version >= '3.7'
itsdangerous==2.1.2; python_version >= '3.7'
jinja2==3.1.2; python_version >= '3.7'
jinja2==3.1.3; python_version >= '3.7'
kaitaistruct==0.9
ldap3==2.9.1
markupsafe==2.1.3; python_version >= '3.7'
markupsafe==2.1.5; python_version >= '3.7'
-e git+https://github.com/citusdata/mitmproxy.git@2fd18ef051b987925a36337ab1d61aa674353b44#egg=mitmproxy
msgpack==1.0.6; python_version >= '3.8'
packaging==23.1; python_version >= '3.7'
msgpack==1.0.7; python_version >= '3.8'
packaging==23.2; python_version >= '3.7'
passlib==1.7.4
pluggy==1.3.0; python_version >= '3.8'
pluggy==1.4.0; python_version >= '3.8'
protobuf==3.18.3; python_version >= '3.5'
psycopg==3.1.11; python_version >= '3.7'
psycopg==3.1.18; python_version >= '3.7'
publicsuffix2==2.20191221
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'
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'
pycparser==2.21
pyopenssl==23.2.0; python_version >= '3.6'
pyopenssl==24.0.0; python_version >= '3.7'
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
pyperclip==1.8.2
pytest==7.4.2; python_version >= '3.7'
pytest-asyncio==0.21.1; python_version >= '3.7'
pytest-repeat==0.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
pytest-timeout==2.1.0; python_version >= '3.6'
pytest-xdist==3.3.1; python_version >= '3.7'
pytest==8.0.0; python_version >= '3.8'
pytest-asyncio==0.23.5; python_version >= '3.8'
pytest-repeat==0.9.3; python_version >= '3.7'
pytest-timeout==2.2.0; python_version >= '3.7'
pytest-xdist==3.5.0; python_version >= '3.7'
pyyaml==6.0.1; python_version >= '3.6'
ruamel.yaml==0.17.16; python_version >= '3'
ruamel.yaml.clib==0.2.8; python_version < '3.10' and platform_python_implementation == 'CPython'
sortedcontainers==2.4.0
tomli==2.0.1; python_version < '3.11'
tornado==6.3.3; python_version >= '3.8'
typing-extensions==4.8.0; python_version >= '3.8'
tornado==6.4; python_version >= '3.8'
typing-extensions==4.9.0; python_version >= '3.8'
urwid==2.1.2
werkzeug==2.3.7; python_version >= '3.8'
wsproto==1.0.0; python_full_version >= '3.6.1'
Expand Down
3 changes: 2 additions & 1 deletion circleci/images/stylechecker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ RUN apk add --no-cache --virtual installdeps \
&& make install \
&& cd ../.. \
&& rm -rf uncrustify-uncrustify-0.68.1/ \
&& pip3 install -Ir /tmp/etc/requirements.txt \
# this image is only used for testing purposes, so should be okay to overwrite system-managed packages
&& pip3 install -Ir /tmp/etc/requirements.txt --break-system-packages \
&& apk del installdeps
61 changes: 31 additions & 30 deletions circleci/images/stylechecker/files/etc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,66 +1,67 @@
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7111
# generated from Citus's Pipfile.lock (in src/test/regress) as of #7491
# using `pipenv requirements --dev > requirements.txt`, so as to avoid the
# need for pipenv/pyenv in this image

-i https://pypi.python.org/simple
attrs==23.1.0; python_version >= '3.7'
black==23.9.1; python_version >= '3.8'
attrs==23.2.0; python_version >= '3.7'
black==24.2.0; python_version >= '3.8'
click==8.0.4; python_version >= '3.6'
flake8==6.1.0; python_full_version >= '3.8.1'
flake8-bugbear==23.9.16; python_full_version >= '3.8.1'
isort==5.12.0; python_full_version >= '3.8.0'
flake8==7.0.0; python_full_version >= '3.8.1'
flake8-bugbear==24.2.6; python_full_version >= '3.8.1'
isort==5.13.2; python_full_version >= '3.8.0'
mccabe==0.7.0; python_version >= '3.6'
mypy-extensions==1.0.0; python_version >= '3.5'
packaging==23.1; python_version >= '3.7'
pathspec==0.11.2; python_version >= '3.7'
platformdirs==3.10.0; python_version >= '3.7'
pycodestyle==2.11.0; python_version >= '3.8'
pyflakes==3.1.0; python_version >= '3.8'
packaging==23.2; python_version >= '3.7'
pathspec==0.12.1; python_version >= '3.8'
platformdirs==4.2.0; python_version >= '3.8'
pycodestyle==2.11.1; python_version >= '3.8'
pyflakes==3.2.0; python_version >= '3.8'
tomli==2.0.1; python_version < '3.11'
typing-extensions==4.8.0; python_version >= '3.8'
typing-extensions==4.9.0; python_version >= '3.8'
asgiref==3.4.1; python_version >= '3.6'
blinker==1.4
brotli==1.0.9
certifi==2023.7.22; python_version >= '3.6'
cffi==1.15.1
certifi==2024.2.2; python_version >= '3.6'
cffi==1.16.0; platform_python_implementation != 'PyPy'
construct==2.9.45
cryptography==41.0.4; python_version >= '3.7'
cryptography==42.0.3; python_version >= '3.7'
docopt==0.6.2
exceptiongroup==1.1.3; python_version < '3.11'
exceptiongroup==1.2.0; python_version < '3.11'
execnet==2.0.2; python_version >= '3.7'
filelock==3.12.4; python_version >= '3.8'
filelock==3.13.1; python_version >= '3.8'
flask==2.0.3; python_version >= '3.6'
h11==0.12.0; python_version >= '3.6'
h2==4.1.0; python_full_version >= '3.6.1'
hpack==4.0.0; python_full_version >= '3.6.1'
hyperframe==6.0.1; python_full_version >= '3.6.1'
iniconfig==2.0.0; python_version >= '3.7'
itsdangerous==2.1.2; python_version >= '3.7'
jinja2==3.1.2; python_version >= '3.7'
jinja2==3.1.3; python_version >= '3.7'
kaitaistruct==0.9
ldap3==2.9.1
markupsafe==2.1.3; python_version >= '3.7'
markupsafe==2.1.5; python_version >= '3.7'
-e git+https://github.com/citusdata/mitmproxy.git@2fd18ef051b987925a36337ab1d61aa674353b44#egg=mitmproxy
msgpack==1.0.6; python_version >= '3.8'
msgpack==1.0.7; python_version >= '3.8'
passlib==1.7.4
pluggy==1.3.0; python_version >= '3.8'
pluggy==1.4.0; python_version >= '3.8'
protobuf==3.18.3; python_version >= '3.5'
psycopg==3.1.11; python_version >= '3.7'
psycopg==3.1.18; python_version >= '3.7'
publicsuffix2==2.20191221
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'
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'
pycparser==2.21
pyopenssl==23.2.0; python_version >= '3.6'
pyopenssl==24.0.0; python_version >= '3.7'
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
pyperclip==1.8.2
pytest==7.4.2; python_version >= '3.7'
pytest-asyncio==0.21.1; python_version >= '3.7'
pytest-repeat==0.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
pytest-timeout==2.1.0; python_version >= '3.6'
pytest-xdist==3.3.1; python_version >= '3.7'
pytest==8.0.0; python_version >= '3.8'
pytest-asyncio==0.23.5; python_version >= '3.8'
pytest-repeat==0.9.3; python_version >= '3.7'
pytest-timeout==2.2.0; python_version >= '3.7'
pytest-xdist==3.5.0; python_version >= '3.7'
pyyaml==6.0.1; python_version >= '3.6'
ruamel.yaml==0.17.16; python_version >= '3'
ruamel.yaml.clib==0.2.8; python_version < '3.10' and platform_python_implementation == 'CPython'
sortedcontainers==2.4.0
tornado==6.3.3; python_version >= '3.8'
tornado==6.4; python_version >= '3.8'
urwid==2.1.2
werkzeug==2.3.7; python_version >= '3.8'
wsproto==1.0.0; python_full_version >= '3.6.1'
Expand Down

0 comments on commit 390dab3

Please sign in to comment.