Skip to content

Combine build-tool update and dependency install into one CI step per job#12643

Merged
bdraco merged 3 commits into
aio-libs:masterfrom
bdraco:ci-combine-pip-install
May 19, 2026
Merged

Combine build-tool update and dependency install into one CI step per job#12643
bdraco merged 3 commits into
aio-libs:masterfrom
bdraco:ci-combine-pip-install

Conversation

@bdraco

@bdraco bdraco commented May 19, 2026

Copy link
Copy Markdown
Member

What do these changes do?

Merges the "Update pip, wheel, setuptools, build, twine" step into the following "Install dependencies" (or "Install cython") step in every job in ci-cd.yml; one resolver invocation per job instead of two, with the same set of packages getting installed.

Are there changes in behavior for the user?

No; same packages are still installed, just in a single pip/uv pip install call. The "Install self" steps are intentionally left alone since they run after make cythonize and rely on built extensions.

Is it a substantial burden for the maintainers to support this?

No; it is a mechanical collapse across seven jobs, easy to revert per-job if anything regresses.

Related issue number

Follow-up to #12641, continuing the work to make the CI install path cheaper for downstream consumers using uv.

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
    • N/A, workflow-only change.
  • Documentation reflects the changes
    • N/A.
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • Already listed.
  • Add a new news fragment into the CHANGES/ folder
    • CHANGES/12643.contrib.rst.

Drafted with Claude Code (claude-opus-4-7); reviewed by @bdraco.

@psf-chronographer psf-chronographer Bot added the bot:chronographer:provided There is a change note present in this PR label May 19, 2026
Comment thread CHANGES/12643.contrib.rst Outdated
@bdraco bdraco added backport-3.13 backport-3.14 Trigger automatic backporting to the 3.14 release branch by Patchback robot labels May 19, 2026
@codecov

codecov Bot commented May 19, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.95%. Comparing base (1aef5d7) to head (61ca425).
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #12643   +/-   ##
=======================================
  Coverage   98.95%   98.95%           
=======================================
  Files         131      131           
  Lines       46476    46476           
  Branches     2410     2410           
=======================================
  Hits        45988    45988           
  Misses        366      366           
  Partials      122      122           
Flag Coverage Δ
Autobahn 22.43% <ø> (ø)
CI-GHA 98.92% <ø> (ø)
OS-Linux 98.67% <ø> (-0.01%) ⬇️
OS-Windows 97.02% <ø> (ø)
OS-macOS 97.92% <ø> (-0.01%) ⬇️
Py-3.10 98.14% <ø> (ø)
Py-3.11 98.41% <ø> (+<0.01%) ⬆️
Py-3.12 98.49% <ø> (-0.01%) ⬇️
Py-3.13 98.46% <ø> (ø)
Py-3.14 98.48% <ø> (-0.01%) ⬇️
Py-3.14t 97.53% <ø> (-0.01%) ⬇️
Py-pypy-3.11 97.41% <ø> (+<0.01%) ⬆️
VM-macos 97.92% <ø> (-0.01%) ⬇️
VM-ubuntu 98.67% <ø> (-0.01%) ⬇️
VM-windows 97.02% <ø> (ø)
cython-coverage 37.75% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@codspeed-hq

codspeed-hq Bot commented May 19, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 68 untouched benchmarks
⏩ 72 skipped benchmarks1


Comparing bdraco:ci-combine-pip-install (61ca425) with master (1aef5d7)

Open in CodSpeed

Footnotes

  1. 72 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports.

@bdraco bdraco marked this pull request as ready for review May 19, 2026 02:48
@bdraco bdraco requested review from asvetlov and webknjaz as code owners May 19, 2026 02:48
@bdraco bdraco merged commit 348f0a1 into aio-libs:master May 19, 2026
48 of 49 checks passed
@patchback

patchback Bot commented May 19, 2026

Copy link
Copy Markdown
Contributor

Backport to 3.13: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 348f0a1 on top of patchback/backports/3.13/348f0a1ed2887662822a44ca0f6ec0668aa292da/pr-12643

Backporting merged PR #12643 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.13/348f0a1ed2887662822a44ca0f6ec0668aa292da/pr-12643 upstream/3.13
  4. Now, cherry-pick PR Combine build-tool update and dependency install into one CI step per job #12643 contents into that branch:
    $ git cherry-pick -x 348f0a1ed2887662822a44ca0f6ec0668aa292da
    If it'll yell at you with something like fatal: Commit 348f0a1ed2887662822a44ca0f6ec0668aa292da is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 348f0a1ed2887662822a44ca0f6ec0668aa292da
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Combine build-tool update and dependency install into one CI step per job #12643 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.13/348f0a1ed2887662822a44ca0f6ec0668aa292da/pr-12643
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback

patchback Bot commented May 19, 2026

Copy link
Copy Markdown
Contributor

Backport to 3.14: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.14/348f0a1ed2887662822a44ca0f6ec0668aa292da/pr-12643

Backported as #12645

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-3.14 Trigger automatic backporting to the 3.14 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant