{{ message }}
ci: Isolate httpx test suite from httpx2 - #7398
Open
ZaafirRizwan wants to merge 1 commit into
Open
Conversation
`scripts/runtox.sh` selects tox environments with an unanchored `grep` over `tox -l`, so the `Test httpx` step's selector `py<version>-httpx` also matched the `py<version>-httpx2-*` environments. That meant the `httpx` CI job ran the httpx2 suite in addition to its own, and on Python 3.14/3.14t/3.15 — where there are no `httpx` environments at all — the `httpx` job ran *only* httpx2 environments, so the two suites were no longer distinguishable in CI. Rename the tox suite from `httpx` to `httpx0` (httpx is still on 0.x) so the two selectors can no longer collide, following the precedent set for `openai-base` in getsentry#4730. `integration_name: "httpx"` keeps the suite pointed at `tests/integrations/httpx` and preserves the minimum supported version lookup in `sentry_sdk/integrations/__init__.py`. `tox.ini` and the Network workflow are regenerated accordingly. Closes getsentry#7151 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #7151
Problem
scripts/runtox.shselects tox environments with an unanchoredgrepovertox -l:ENV="$(uv run tox -l | grep -- "$searchstring" | grep -v -- '-latest$' | tr $'\n' ',')"The Network workflow's
Test httpxstep passespy<version>-httpx, which therefore also matches thepy<version>-httpx2-*environments.The result:
httpxjob ran the httpx2 suite as well as its own, duplicating the work already done by thehttpx2job.httpxenvironments at all, thehttpxjob ran only httpx2 environments — which is what the issue reports.Fix
Rename the tox test suite from
httpxtohttpx0(httpx is still on 0.x), so thehttpx0andhttpx2selectors can no longer collide. This follows the precedent set foropenai-basein #4730, where the suite was renamed rather than making the selector boundary-aware.integration_name: "httpx"is added alongside the rename so the suite keeps resolving to the existing integration:_TESTPATHstaystests/integrations/httpx(the test directory is unchanged)_MIN_VERSIONSinsentry_sdk/integrations/__init__.pykeeps working, so the suite still floors at httpx 0.16.0Without
integration_namethe suite would point at a nonexistenttests/integrations/httpx0directory and lose its version floor.Changes
scripts/populate_tox/config.py— rename the suite, addintegration_namescripts/split_tox_gh_actions/split_tox_gh_actions.py— update theNetworkgroupscripts/populate_tox/README.md— thepythonkey example documents this suite; updated to matchtox.iniand.github/workflows/test-integrations-network.yml— regeneratedThe
tox.inidiff is a pure rename: 207 lines removed, 207 added, no version or dependency changes.Note
The same class of collision still exists for
redis, which is a prefix ofredis_py_cluster_legacy, so theTest redisstep also runs the cluster-legacy suite. Left out of this PR to keep it scoped to #7151 — happy to open a separate issue for it.