Skip to content

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented May 22, 2025

This PR is to 3.12 since we have dropped the loop argument on master

The loop argument was being ignored in AsyncResolver in 3.12/3.11 where it should still be supported

fixes #10787

@bdraco bdraco added this to the 3.12 milestone May 22, 2025
@bdraco bdraco requested a review from asvetlov as a code owner May 22, 2025 21:45
@bdraco bdraco requested a review from webknjaz as a code owner May 22, 2025 21:48
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label May 22, 2025
Copy link

codecov bot commented May 22, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.16%. Comparing base (31d3638) to head (4cb85fb).
⚠️ Report is 132 commits behind head on 3.12.
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##             3.12   #10951   +/-   ##
=======================================
  Coverage   98.16%   98.16%           
=======================================
  Files         130      130           
  Lines       39675    39690   +15     
  Branches     2242     2242           
=======================================
+ Hits        38948    38963   +15     
  Misses        555      555           
  Partials      172      172           
Flag Coverage Δ
CI-GHA 98.05% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.78% <100.00%> (+<0.01%) ⬆️
OS-Windows 95.26% <100.00%> (+<0.01%) ⬆️
OS-macOS 96.94% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 96.83% <100.00%> (+<0.01%) ⬆️
Py-3.10.17 97.37% <100.00%> (+<0.01%) ⬆️
Py-3.11.12 97.48% <100.00%> (+0.04%) ⬆️
Py-3.11.9 96.93% <100.00%> (-0.01%) ⬇️
Py-3.12.10 97.84% <100.00%> (+<0.01%) ⬆️
Py-3.13.3 97.82% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 96.72% <100.00%> (+<0.01%) ⬆️
Py-3.9.22 97.25% <100.00%> (+0.02%) ⬆️
Py-pypy7.3.16 89.28% <100.00%> (+8.67%) ⬆️
VM-macos 96.94% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 97.78% <100.00%> (+<0.01%) ⬆️
VM-windows 95.26% <100.00%> (+<0.01%) ⬆️

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.

Copy link

codspeed-hq bot commented May 22, 2025

CodSpeed Performance Report

Merging #10951 will not alter performance

Comparing accept_loop (4cb85fb) with 3.12 (1f1bc8f)

Summary

✅ 59 untouched benchmarks

@bdraco bdraco enabled auto-merge (squash) May 22, 2025 21:56
@bdraco bdraco merged commit 12ff66d into 3.12 May 22, 2025
33 checks passed
@bdraco bdraco deleted the accept_loop branch May 22, 2025 22:00
Copy link
Contributor

patchback bot commented May 22, 2025

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

❌ Failed to cleanly apply 12ff66d on top of patchback/backports/3.11/12ff66d5312bd9df894e506f8802b133d0293b91/pr-10951

Backporting merged PR #10951 into 3.12

  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.11/12ff66d5312bd9df894e506f8802b133d0293b91/pr-10951 upstream/3.11
  4. Now, cherry-pick PR [3.12] Fix AsyncResolver not using the loop argument #10951 contents into that branch:
    $ git cherry-pick -x 12ff66d5312bd9df894e506f8802b133d0293b91
    If it'll yell at you with something like fatal: Commit 12ff66d5312bd9df894e506f8802b133d0293b91 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 12ff66d5312bd9df894e506f8802b133d0293b91
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR [3.12] Fix AsyncResolver not using the loop argument #10951 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/12ff66d5312bd9df894e506f8802b133d0293b91/pr-10951
  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.

bdraco added a commit that referenced this pull request May 22, 2025
bdraco added a commit that referenced this pull request May 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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