Skip to content

Allow patched dependency versions on the pinned Citus main runtime - #6

Merged
ibrahim halatci (ihalatci) merged 3 commits into
mainfrom
ihalatci-dependency-bounds-main
Nov 21, 2026
Merged

ibrahim halatci (ihalatci) merged 3 commits into
mainfrom
ihalatci-dependency-bounds-main

Conversation

@ihalatci

@ihalatci ibrahim halatci (ihalatci) commented Nov 13, 2026 •

Copy link
Copy Markdown

Description

Permit patched dependencies for the Citus main line without changing Python >=3.12, runtime source, lower bounds, or unrelated dependency resolutions:

Dependency Original upper bound New upper bound
Brotli 1.2.0 1.2.1
msgpack 1.2.1 1.2.3
tornado 6.5.8 6.6.1
urwid 4.0.0 4.0.7

Current head: 5cd63296e7dab274e275553df76e9699ea220032, appended to 2f2b5de5baceb161326503dd1602940530032868. The original cap commit 0dac7e3f656baf0ac5b9bfcb1c13aa01cad2faa5 is based directly on the existing Citus runtime pin a16444362cc0393ccf7329f50fc909b711729de7; published history is unchanged. #5 is merged and this PR targets main.

The fork's uv.lock now actually resolves Tornado 6.6.1 (previously 6.5.4), not just a relaxed cap. Root metadata matches pyproject.toml. Programmatic comparison confirmed changes only to the Tornado package record and mitmproxy root requirements: every unrelated version and artifact hash is preserved. The other three dependency changes remain upper-bound relaxations, separately validated at their exact target versions.

Actual CI repair and outcome: the initial stale-lock error was fixed in 2f2b5de5; its PR CI passed. Its branch-push CI failed only in both Debian 11 Linux builds (HTTP 404 downloading Bullseye packages before Python), with the aggregate check reporting those failures. This follow-up changes only those two build-container entries to Debian 12, matching the already-merged #5/main workflow. No checks, repository verification, or failure gates were suppressed.

All fresh runs at 5cd63296 are completed successfully:

Readback: gh run view 44903541045 --repo citusdata/mitmproxy --json status,conclusion,jobs, gh run view 44903545431 --repo citusdata/mitmproxy --json status,conclusion,jobs, and gh run view 44903544897 --repo citusdata/mitmproxy --json status,conclusion each confirmed completed/success.

Latest validation on WSL Linux, Python 3.12.12, from /home/ihalatci/Development/mitmproxy-dependency-bounds/main:

  • uv lock --python /home/ihalatci/.local/bin/python3.12 --upgrade-package tornado==6.6.1 - passed; only Tornado resolution upgraded.
  • uv lock --check --python /home/ihalatci/.local/bin/python3.12 - passed.
  • UV_PROJECT_ENVIRONMENT=/home/ihalatci/Development/mitmproxy-dependency-bounds/env-ci-lock uv run --locked --python /home/ihalatci/.local/bin/python3.12 --only-group tox tox -e lint,filename_matching,mypy,py312 -- test/mitmproxy/net/test_encoding.py test/mitmproxy/tools/console test/mitmproxy/tools/web test/mitmproxy/io test/mitmproxy/contentviews test/mitmproxy/addons/test_onboarding.py - all checks passed; 298 passed, 1 skipped.
  • uv pip check --python .tox/py312/bin/python - passed.
  • .tox/py312/bin/python -c 'import tornado; assert tornado.version == "6.6.1"; print(tornado.version)' - passed; verifies actual installed version.
  • .tox/py312/bin/mitmdump --version - passed.
  • UV_PROJECT_ENVIRONMENT=/home/ihalatci/Development/mitmproxy-dependency-bounds/env-ci-lock uv run --locked --python /home/ihalatci/.local/bin/python3.12 --only-group tox tox -e py312 - 1955 passed, 3 skipped. Skips are not treated as compatibility evidence.

Earlier exact-target validation: uv pip install --python env-main/bin/python -e ./main --group main/pyproject.toml:dev Brotli==1.2.1 msgpack==1.2.3 tornado==6.6 urwid==4.0.7 - full resolution/install passed; uv pip check --python env-main/bin/python and env-main/bin/mitmdump --version passed. The latest complete remote CI matrix validates the new locked Tornado 6.6.1 environment.

Downstream consumption is separate: Citus default main currently pins a16444362cc0393ccf7329f50fc909b711729de7 and Tornado 6.5.8. citusdata/citus#8973, at ecec459d9a9f472268255d426c1998fe5d2d95ef, instead pins 0dac7e3f656baf0ac5b9bfcb1c13aa01cad2faa5 and Tornado 6.6 in its Pipfile/lock. These are exact Git SHA dependencies: merging #6 is not technically required to consume a published commit. To consume 6.6.1, the downstream update must explicitly pin 5cd63296e7dab274e275553df76e9699ea220032, resolve Tornado 6.6.1, synchronize lock/devcontainer/exported requirements, regenerate test images, and run its CI. No downstream source/image changes were made here.

The earlier Citus CI passed all 12 failure/enterprise-failure/pytest/query-generator jobs across PG17/18/19 at the old 0dac7e3f/Tornado 6.6 pin; it does not validate this new SHA or 6.6.1. No merges, stable promotions, or release-line dependency updates are included.

Existing tests cover the affected APIs; no new tests or changelog entry were added for this bounded dependency/CI prerequisite.

Checklist

  • I have updated tests where applicable.
  • I have added an entry to the CHANGELOG.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@autofix-troubleshooter

Copy link
Copy Markdown

Hi! I'm the autofix logoautofix.ci troubleshooter bot.

It looks like you correctly set up a CI job that uses the autofix.ci GitHub Action, but the autofix.ci GitHub App has not been installed for this repository. This means that autofix.ci unfortunately does not have the permissions to fix this pull request. If you are the repository owner, please install the app and then restart the CI workflow! 😃

Keep resolved dependency versions unchanged while matching the four widened project requirements.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Resolve only Tornado and synchronize its requirement metadata. Match the already-merged Bookworm CI baseline without changing runtime source.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@ihalatci
ibrahim halatci (ihalatci) merged commit f36d2a4 into main Nov 21, 2026
54 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants