From ff5bc0ac94768491d2c70bbd2213849305351b9d Mon Sep 17 00:00:00 2001 From: ihalatci Date: Thu, 16 Apr 2026 13:48:58 +0000 Subject: [PATCH 1/4] Refresh generated Citus image requirements --- .../files/etc/requirements.txt | 39 +++++++++---------- .../failtester/files/etc/requirements.txt | 39 +++++++++---------- .../files/etc/requirements.txt | 39 +++++++++---------- .../stylechecker/files/etc/requirements.txt | 13 ++++--- 4 files changed, 64 insertions(+), 66 deletions(-) diff --git a/circleci/images/citusupgradetester/files/etc/requirements.txt b/circleci/images/citusupgradetester/files/etc/requirements.txt index 15074b7..650b637 100644 --- a/circleci/images/citusupgradetester/files/etc/requirements.txt +++ b/circleci/images/citusupgradetester/files/etc/requirements.txt @@ -1,4 +1,4 @@ -# generated from Citus's Pipfile.lock (in src/test/regress) as of citusdata/citus#8488 +# generated from Citus's Pipfile.lock (in src/test/regress) # using `pipenv requirements > requirements.txt`, so as to avoid the # need for pipenv/pyenv in this image @@ -6,20 +6,20 @@ aioquic==1.2.0; python_version >= '3.8' argon2-cffi==25.1.0; python_version >= '3.8' argon2-cffi-bindings==25.1.0; python_version >= '3.9' -asgiref==3.10.0; python_version >= '3.9' -attrs==25.4.0; python_version >= '3.9' +asgiref==3.11.0; python_version >= '3.9' +attrs==26.1.0; python_version >= '3.9' bcrypt==5.0.0; python_version >= '3.8' blinker==1.9.0; python_version >= '3.9' brotli==1.2.0 certifi==2026.2.25; python_version >= '3.7' cffi==2.0.0; python_version >= '3.9' -click==8.3.1; python_version >= '3.10' +click==8.3.2; python_version >= '3.10' construct==2.10.70; python_version >= '3.6' -cryptography==46.0.5; python_version >= '3.8' and python_full_version not in '3.9.0, 3.9.1' +cryptography==46.0.7; python_version >= '3.8' and python_full_version not in '3.9.0, 3.9.1' docopt==0.6.2 execnet==2.1.2; python_version >= '3.8' -filelock==3.25.0; python_version >= '3.10' -flask==3.1.2; python_version >= '3.9' +filelock==3.28.0; python_version >= '3.10' +flask==3.1.3; python_version >= '3.9' h11==0.16.0; python_version >= '3.8' h2==4.3.0; python_version >= '3.9' hpack==4.1.0; python_version >= '3.9' @@ -30,36 +30,35 @@ jinja2==3.1.6; python_version >= '3.7' kaitaistruct==0.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' ldap3==2.9.1 markupsafe==3.0.3; python_version >= '3.9' -mitmproxy @ git+https://github.com/citusdata/mitmproxy.git@30b588eb1b7c66da233d7c471ec23f2b632ed531 +mitmproxy==12.2.2; python_version >= '3.12' mitmproxy-linux==0.12.9; python_version >= '3.12' mitmproxy-rs==0.12.9; python_version >= '3.12' msgpack==1.1.2; python_version >= '3.9' -packaging==26.0; python_version >= '3.8' +packaging==26.1; python_version >= '3.8' pluggy==1.6.0; python_version >= '3.9' psycopg==3.3.3; python_version >= '3.10' publicsuffix2==2.20191221 -pyasn1==0.6.2; python_version >= '3.8' +pyasn1==0.6.3; python_version >= '3.8' pyasn1-modules==0.4.2; python_version >= '3.8' pycparser==3.0; python_version >= '3.10' -pygments==2.19.2; python_version >= '3.8' -pylsqpack==0.3.23; python_version >= '3.10' +pygments==2.20.0; python_version >= '3.9' +pylsqpack==0.3.24; python_version >= '3.10' pyopenssl==25.3.0; python_version >= '3.7' -pyparsing==3.2.5; python_version >= '3.9' +pyparsing==3.3.2; python_version >= '3.9' pyperclip==1.9.0 -pytest==9.0.2; python_version >= '3.10' +pytest==9.0.3; python_version >= '3.10' pytest-asyncio==1.3.0; python_version >= '3.10' pytest-repeat==0.9.4; python_version >= '3.9' pytest-timeout==2.4.0; python_version >= '3.7' pytest-xdist==3.8.0; python_version >= '3.9' pyyaml==6.0.3; python_version >= '3.8' -ruamel.yaml==0.18.16; python_version >= '3.8' -ruamel.yaml.clib==0.2.15; python_version >= '3.9' +ruamel.yaml==0.19.1; python_version >= '3.9' service-identity==24.2.0; python_version >= '3.8' sortedcontainers==2.4.0 -tornado==6.5.2; python_version >= '3.9' +tornado==6.5.5; python_version >= '3.9' typing-extensions==4.14.0; python_version >= '3.9' -urwid==3.0.3; python_full_version >= '3.9.0' +urwid==3.0.5; python_full_version >= '3.9.0' wcwidth==0.6.0; python_version >= '3.8' -werkzeug==3.1.5; python_version >= '3.9' -wsproto==1.2.0; python_full_version >= '3.7.0' +werkzeug==3.1.6; python_version >= '3.9' +wsproto==1.3.2; python_version >= '3.10' zstandard==0.25.0; python_version >= '3.9' diff --git a/circleci/images/failtester/files/etc/requirements.txt b/circleci/images/failtester/files/etc/requirements.txt index 15074b7..650b637 100644 --- a/circleci/images/failtester/files/etc/requirements.txt +++ b/circleci/images/failtester/files/etc/requirements.txt @@ -1,4 +1,4 @@ -# generated from Citus's Pipfile.lock (in src/test/regress) as of citusdata/citus#8488 +# generated from Citus's Pipfile.lock (in src/test/regress) # using `pipenv requirements > requirements.txt`, so as to avoid the # need for pipenv/pyenv in this image @@ -6,20 +6,20 @@ aioquic==1.2.0; python_version >= '3.8' argon2-cffi==25.1.0; python_version >= '3.8' argon2-cffi-bindings==25.1.0; python_version >= '3.9' -asgiref==3.10.0; python_version >= '3.9' -attrs==25.4.0; python_version >= '3.9' +asgiref==3.11.0; python_version >= '3.9' +attrs==26.1.0; python_version >= '3.9' bcrypt==5.0.0; python_version >= '3.8' blinker==1.9.0; python_version >= '3.9' brotli==1.2.0 certifi==2026.2.25; python_version >= '3.7' cffi==2.0.0; python_version >= '3.9' -click==8.3.1; python_version >= '3.10' +click==8.3.2; python_version >= '3.10' construct==2.10.70; python_version >= '3.6' -cryptography==46.0.5; python_version >= '3.8' and python_full_version not in '3.9.0, 3.9.1' +cryptography==46.0.7; python_version >= '3.8' and python_full_version not in '3.9.0, 3.9.1' docopt==0.6.2 execnet==2.1.2; python_version >= '3.8' -filelock==3.25.0; python_version >= '3.10' -flask==3.1.2; python_version >= '3.9' +filelock==3.28.0; python_version >= '3.10' +flask==3.1.3; python_version >= '3.9' h11==0.16.0; python_version >= '3.8' h2==4.3.0; python_version >= '3.9' hpack==4.1.0; python_version >= '3.9' @@ -30,36 +30,35 @@ jinja2==3.1.6; python_version >= '3.7' kaitaistruct==0.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' ldap3==2.9.1 markupsafe==3.0.3; python_version >= '3.9' -mitmproxy @ git+https://github.com/citusdata/mitmproxy.git@30b588eb1b7c66da233d7c471ec23f2b632ed531 +mitmproxy==12.2.2; python_version >= '3.12' mitmproxy-linux==0.12.9; python_version >= '3.12' mitmproxy-rs==0.12.9; python_version >= '3.12' msgpack==1.1.2; python_version >= '3.9' -packaging==26.0; python_version >= '3.8' +packaging==26.1; python_version >= '3.8' pluggy==1.6.0; python_version >= '3.9' psycopg==3.3.3; python_version >= '3.10' publicsuffix2==2.20191221 -pyasn1==0.6.2; python_version >= '3.8' +pyasn1==0.6.3; python_version >= '3.8' pyasn1-modules==0.4.2; python_version >= '3.8' pycparser==3.0; python_version >= '3.10' -pygments==2.19.2; python_version >= '3.8' -pylsqpack==0.3.23; python_version >= '3.10' +pygments==2.20.0; python_version >= '3.9' +pylsqpack==0.3.24; python_version >= '3.10' pyopenssl==25.3.0; python_version >= '3.7' -pyparsing==3.2.5; python_version >= '3.9' +pyparsing==3.3.2; python_version >= '3.9' pyperclip==1.9.0 -pytest==9.0.2; python_version >= '3.10' +pytest==9.0.3; python_version >= '3.10' pytest-asyncio==1.3.0; python_version >= '3.10' pytest-repeat==0.9.4; python_version >= '3.9' pytest-timeout==2.4.0; python_version >= '3.7' pytest-xdist==3.8.0; python_version >= '3.9' pyyaml==6.0.3; python_version >= '3.8' -ruamel.yaml==0.18.16; python_version >= '3.8' -ruamel.yaml.clib==0.2.15; python_version >= '3.9' +ruamel.yaml==0.19.1; python_version >= '3.9' service-identity==24.2.0; python_version >= '3.8' sortedcontainers==2.4.0 -tornado==6.5.2; python_version >= '3.9' +tornado==6.5.5; python_version >= '3.9' typing-extensions==4.14.0; python_version >= '3.9' -urwid==3.0.3; python_full_version >= '3.9.0' +urwid==3.0.5; python_full_version >= '3.9.0' wcwidth==0.6.0; python_version >= '3.8' -werkzeug==3.1.5; python_version >= '3.9' -wsproto==1.2.0; python_full_version >= '3.7.0' +werkzeug==3.1.6; python_version >= '3.9' +wsproto==1.3.2; python_version >= '3.10' zstandard==0.25.0; python_version >= '3.9' diff --git a/circleci/images/pgupgradetester/files/etc/requirements.txt b/circleci/images/pgupgradetester/files/etc/requirements.txt index 15074b7..650b637 100644 --- a/circleci/images/pgupgradetester/files/etc/requirements.txt +++ b/circleci/images/pgupgradetester/files/etc/requirements.txt @@ -1,4 +1,4 @@ -# generated from Citus's Pipfile.lock (in src/test/regress) as of citusdata/citus#8488 +# generated from Citus's Pipfile.lock (in src/test/regress) # using `pipenv requirements > requirements.txt`, so as to avoid the # need for pipenv/pyenv in this image @@ -6,20 +6,20 @@ aioquic==1.2.0; python_version >= '3.8' argon2-cffi==25.1.0; python_version >= '3.8' argon2-cffi-bindings==25.1.0; python_version >= '3.9' -asgiref==3.10.0; python_version >= '3.9' -attrs==25.4.0; python_version >= '3.9' +asgiref==3.11.0; python_version >= '3.9' +attrs==26.1.0; python_version >= '3.9' bcrypt==5.0.0; python_version >= '3.8' blinker==1.9.0; python_version >= '3.9' brotli==1.2.0 certifi==2026.2.25; python_version >= '3.7' cffi==2.0.0; python_version >= '3.9' -click==8.3.1; python_version >= '3.10' +click==8.3.2; python_version >= '3.10' construct==2.10.70; python_version >= '3.6' -cryptography==46.0.5; python_version >= '3.8' and python_full_version not in '3.9.0, 3.9.1' +cryptography==46.0.7; python_version >= '3.8' and python_full_version not in '3.9.0, 3.9.1' docopt==0.6.2 execnet==2.1.2; python_version >= '3.8' -filelock==3.25.0; python_version >= '3.10' -flask==3.1.2; python_version >= '3.9' +filelock==3.28.0; python_version >= '3.10' +flask==3.1.3; python_version >= '3.9' h11==0.16.0; python_version >= '3.8' h2==4.3.0; python_version >= '3.9' hpack==4.1.0; python_version >= '3.9' @@ -30,36 +30,35 @@ jinja2==3.1.6; python_version >= '3.7' kaitaistruct==0.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' ldap3==2.9.1 markupsafe==3.0.3; python_version >= '3.9' -mitmproxy @ git+https://github.com/citusdata/mitmproxy.git@30b588eb1b7c66da233d7c471ec23f2b632ed531 +mitmproxy==12.2.2; python_version >= '3.12' mitmproxy-linux==0.12.9; python_version >= '3.12' mitmproxy-rs==0.12.9; python_version >= '3.12' msgpack==1.1.2; python_version >= '3.9' -packaging==26.0; python_version >= '3.8' +packaging==26.1; python_version >= '3.8' pluggy==1.6.0; python_version >= '3.9' psycopg==3.3.3; python_version >= '3.10' publicsuffix2==2.20191221 -pyasn1==0.6.2; python_version >= '3.8' +pyasn1==0.6.3; python_version >= '3.8' pyasn1-modules==0.4.2; python_version >= '3.8' pycparser==3.0; python_version >= '3.10' -pygments==2.19.2; python_version >= '3.8' -pylsqpack==0.3.23; python_version >= '3.10' +pygments==2.20.0; python_version >= '3.9' +pylsqpack==0.3.24; python_version >= '3.10' pyopenssl==25.3.0; python_version >= '3.7' -pyparsing==3.2.5; python_version >= '3.9' +pyparsing==3.3.2; python_version >= '3.9' pyperclip==1.9.0 -pytest==9.0.2; python_version >= '3.10' +pytest==9.0.3; python_version >= '3.10' pytest-asyncio==1.3.0; python_version >= '3.10' pytest-repeat==0.9.4; python_version >= '3.9' pytest-timeout==2.4.0; python_version >= '3.7' pytest-xdist==3.8.0; python_version >= '3.9' pyyaml==6.0.3; python_version >= '3.8' -ruamel.yaml==0.18.16; python_version >= '3.8' -ruamel.yaml.clib==0.2.15; python_version >= '3.9' +ruamel.yaml==0.19.1; python_version >= '3.9' service-identity==24.2.0; python_version >= '3.8' sortedcontainers==2.4.0 -tornado==6.5.2; python_version >= '3.9' +tornado==6.5.5; python_version >= '3.9' typing-extensions==4.14.0; python_version >= '3.9' -urwid==3.0.3; python_full_version >= '3.9.0' +urwid==3.0.5; python_full_version >= '3.9.0' wcwidth==0.6.0; python_version >= '3.8' -werkzeug==3.1.5; python_version >= '3.9' -wsproto==1.2.0; python_full_version >= '3.7.0' +werkzeug==3.1.6; python_version >= '3.9' +wsproto==1.3.2; python_version >= '3.10' zstandard==0.25.0; python_version >= '3.9' diff --git a/circleci/images/stylechecker/files/etc/requirements.txt b/circleci/images/stylechecker/files/etc/requirements.txt index 8c950b2..fa1ccf4 100644 --- a/circleci/images/stylechecker/files/etc/requirements.txt +++ b/circleci/images/stylechecker/files/etc/requirements.txt @@ -1,18 +1,19 @@ -# generated from Citus's Pipfile.lock (in src/test/regress) as of citusdata/citus#8488 +# generated from Citus's Pipfile.lock (in src/test/regress) # using `pipenv requirements --dev-only > requirements.txt`, so as to avoid the # need for pipenv/pyenv in this image -i https://pypi.python.org/simple -attrs==25.4.0; python_version >= '3.9' -black==24.10.0; python_version >= '3.9' -click==8.3.1; python_version >= '3.10' +attrs==26.1.0; python_version >= '3.9' +black==26.3.1; python_version >= '3.10' +click==8.3.2; python_version >= '3.10' flake8==7.3.0; python_version >= '3.9' flake8-bugbear==25.11.29; python_version >= '3.10' isort==8.0.1; python_full_version >= '3.10.0' mccabe==0.7.0; python_version >= '3.6' mypy-extensions==1.1.0; python_version >= '3.8' -packaging==26.0; python_version >= '3.8' +packaging==26.1; python_version >= '3.8' pathspec==1.0.4; python_version >= '3.9' -platformdirs==4.9.2; python_version >= '3.10' +platformdirs==4.9.6; python_version >= '3.10' pycodestyle==2.14.0; python_version >= '3.9' pyflakes==3.4.0; python_version >= '3.9' +pytokens==0.4.1; python_version >= '3.8' From c61a57b50bc001d50cb82712c188fb3a5c4f07cc Mon Sep 17 00:00:00 2001 From: ihalatci Date: Thu, 16 Apr 2026 13:53:19 +0000 Subject: [PATCH 2/4] updated comments with PR from citus --- circleci/images/citusupgradetester/files/etc/requirements.txt | 2 +- circleci/images/failtester/files/etc/requirements.txt | 2 +- circleci/images/pgupgradetester/files/etc/requirements.txt | 2 +- circleci/images/stylechecker/files/etc/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/circleci/images/citusupgradetester/files/etc/requirements.txt b/circleci/images/citusupgradetester/files/etc/requirements.txt index 650b637..d3e0ead 100644 --- a/circleci/images/citusupgradetester/files/etc/requirements.txt +++ b/circleci/images/citusupgradetester/files/etc/requirements.txt @@ -1,4 +1,4 @@ -# generated from Citus's Pipfile.lock (in src/test/regress) +# generated from Citus's Pipfile.lock (in src/test/regress) as of citusdata/citus#8547 # using `pipenv requirements > requirements.txt`, so as to avoid the # need for pipenv/pyenv in this image diff --git a/circleci/images/failtester/files/etc/requirements.txt b/circleci/images/failtester/files/etc/requirements.txt index 650b637..d3e0ead 100644 --- a/circleci/images/failtester/files/etc/requirements.txt +++ b/circleci/images/failtester/files/etc/requirements.txt @@ -1,4 +1,4 @@ -# generated from Citus's Pipfile.lock (in src/test/regress) +# generated from Citus's Pipfile.lock (in src/test/regress) as of citusdata/citus#8547 # using `pipenv requirements > requirements.txt`, so as to avoid the # need for pipenv/pyenv in this image diff --git a/circleci/images/pgupgradetester/files/etc/requirements.txt b/circleci/images/pgupgradetester/files/etc/requirements.txt index 650b637..d3e0ead 100644 --- a/circleci/images/pgupgradetester/files/etc/requirements.txt +++ b/circleci/images/pgupgradetester/files/etc/requirements.txt @@ -1,4 +1,4 @@ -# generated from Citus's Pipfile.lock (in src/test/regress) +# generated from Citus's Pipfile.lock (in src/test/regress) as of citusdata/citus#8547 # using `pipenv requirements > requirements.txt`, so as to avoid the # need for pipenv/pyenv in this image diff --git a/circleci/images/stylechecker/files/etc/requirements.txt b/circleci/images/stylechecker/files/etc/requirements.txt index fa1ccf4..bc4d321 100644 --- a/circleci/images/stylechecker/files/etc/requirements.txt +++ b/circleci/images/stylechecker/files/etc/requirements.txt @@ -1,4 +1,4 @@ -# generated from Citus's Pipfile.lock (in src/test/regress) +# generated from Citus's Pipfile.lock (in src/test/regress) as of citusdata/citus#8547 # using `pipenv requirements --dev-only > requirements.txt`, so as to avoid the # need for pipenv/pyenv in this image From 2933cfdc17fe4929ed8b6252a7194036247f00dd Mon Sep 17 00:00:00 2001 From: ihalatci Date: Thu, 16 Apr 2026 14:49:34 +0000 Subject: [PATCH 3/4] Use patched Citus mitmproxy fork in test images --- circleci/images/citusupgradetester/files/etc/requirements.txt | 2 +- circleci/images/failtester/files/etc/requirements.txt | 2 +- circleci/images/pgupgradetester/files/etc/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/circleci/images/citusupgradetester/files/etc/requirements.txt b/circleci/images/citusupgradetester/files/etc/requirements.txt index d3e0ead..0c9b89b 100644 --- a/circleci/images/citusupgradetester/files/etc/requirements.txt +++ b/circleci/images/citusupgradetester/files/etc/requirements.txt @@ -30,7 +30,7 @@ jinja2==3.1.6; python_version >= '3.7' kaitaistruct==0.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' ldap3==2.9.1 markupsafe==3.0.3; python_version >= '3.9' -mitmproxy==12.2.2; python_version >= '3.12' +mitmproxy @ git+https://github.com/citusdata/mitmproxy.git@70bad9a3c098f605e5f8b25553e5db5334018ff1 mitmproxy-linux==0.12.9; python_version >= '3.12' mitmproxy-rs==0.12.9; python_version >= '3.12' msgpack==1.1.2; python_version >= '3.9' diff --git a/circleci/images/failtester/files/etc/requirements.txt b/circleci/images/failtester/files/etc/requirements.txt index d3e0ead..0c9b89b 100644 --- a/circleci/images/failtester/files/etc/requirements.txt +++ b/circleci/images/failtester/files/etc/requirements.txt @@ -30,7 +30,7 @@ jinja2==3.1.6; python_version >= '3.7' kaitaistruct==0.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' ldap3==2.9.1 markupsafe==3.0.3; python_version >= '3.9' -mitmproxy==12.2.2; python_version >= '3.12' +mitmproxy @ git+https://github.com/citusdata/mitmproxy.git@70bad9a3c098f605e5f8b25553e5db5334018ff1 mitmproxy-linux==0.12.9; python_version >= '3.12' mitmproxy-rs==0.12.9; python_version >= '3.12' msgpack==1.1.2; python_version >= '3.9' diff --git a/circleci/images/pgupgradetester/files/etc/requirements.txt b/circleci/images/pgupgradetester/files/etc/requirements.txt index d3e0ead..0c9b89b 100644 --- a/circleci/images/pgupgradetester/files/etc/requirements.txt +++ b/circleci/images/pgupgradetester/files/etc/requirements.txt @@ -30,7 +30,7 @@ jinja2==3.1.6; python_version >= '3.7' kaitaistruct==0.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' ldap3==2.9.1 markupsafe==3.0.3; python_version >= '3.9' -mitmproxy==12.2.2; python_version >= '3.12' +mitmproxy @ git+https://github.com/citusdata/mitmproxy.git@70bad9a3c098f605e5f8b25553e5db5334018ff1 mitmproxy-linux==0.12.9; python_version >= '3.12' mitmproxy-rs==0.12.9; python_version >= '3.12' msgpack==1.1.2; python_version >= '3.9' From cdf3608bae9317c1ce750bdb338efa96128069f6 Mon Sep 17 00:00:00 2001 From: ihalatci Date: Fri, 17 Apr 2026 10:00:37 +0000 Subject: [PATCH 4/4] update gha versions --- .github/workflows/build-test-images.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-test-images.yml b/.github/workflows/build-test-images.yml index 8994f5b..b78168a 100644 --- a/.github/workflows/build-test-images.yml +++ b/.github/workflows/build-test-images.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: # Need the repo checked out in order to read the file - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - id: get_versions run: cat circleci/images/PG_VERSIONS >> $GITHUB_OUTPUT outputs: @@ -37,10 +37,10 @@ jobs: steps: &build_images_per_pg_steps - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: 'Login to GitHub Container Registry' - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.actor }} @@ -71,10 +71,10 @@ jobs: steps: &build_shared_image_steps - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: 'Login to GitHub Container Registry' - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.actor }}