Skip to content

Move ClientResponse to top of file #11025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 26, 2025
Merged

Conversation

Dreamsorcerer
Copy link
Member

This will reduce the diff and make easier to resolve conflicts in #11012.

No code changes here.

@Dreamsorcerer Dreamsorcerer requested a review from asvetlov as a code owner May 26, 2025 13:09
@Dreamsorcerer Dreamsorcerer added backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot backport-3.13 Trigger automatic backporting to the 3.13 release branch by Patchback robot bot:chronographer:skip This PR does not need to include a change note labels May 26, 2025
Copy link

codspeed-hq bot commented May 26, 2025

CodSpeed Performance Report

Merging #11025 will not alter performance

Comparing Dreamsorcerer-patch-5 (5dc54bb) with master (852297c)

Summary

✅ 59 untouched benchmarks

@Dreamsorcerer Dreamsorcerer enabled auto-merge (squash) May 26, 2025 13:21
Copy link

codecov bot commented May 26, 2025

Codecov Report

Attention: Patch coverage is 97.99666% with 12 lines in your changes missing coverage. Please review.

Project coverage is 98.81%. Comparing base (852297c) to head (5dc54bb).
Report is 1 commits behind head on master.

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
aiohttp/client_reqrep.py 97.99% 5 Missing and 7 partials ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##           master   #11025   +/-   ##
=======================================
  Coverage   98.80%   98.81%           
=======================================
  Files         129      129           
  Lines       41312    41312           
  Branches     2226     2226           
=======================================
+ Hits        40820    40823    +3     
+ Misses        342      339    -3     
  Partials      150      150           
Flag Coverage Δ
CI-GHA 98.70% <97.66%> (+<0.01%) ⬆️
OS-Linux 98.42% <97.66%> (+<0.01%) ⬆️
OS-Windows 96.67% <97.66%> (ø)
OS-macOS 97.61% <97.66%> (ø)
Py-3.10.11 97.50% <97.16%> (-0.01%) ⬇️
Py-3.10.17 98.01% <97.16%> (ø)
Py-3.11.12 98.08% <96.99%> (-0.01%) ⬇️
Py-3.11.9 97.58% <96.99%> (+<0.01%) ⬆️
Py-3.12.10 98.48% <97.32%> (ø)
Py-3.13.3 98.47% <97.49%> (+<0.01%) ⬆️
Py-3.9.13 97.38% <96.98%> (-0.01%) ⬇️
Py-3.9.22 97.88% <96.98%> (ø)
Py-pypy7.3.16 85.52% <95.65%> (-2.82%) ⬇️
VM-macos 97.61% <97.66%> (ø)
VM-ubuntu 98.42% <97.66%> (+<0.01%) ⬆️
VM-windows 96.67% <97.66%> (ø)

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.

@Dreamsorcerer Dreamsorcerer merged commit 9b671b2 into master May 26, 2025
38 of 39 checks passed
@Dreamsorcerer Dreamsorcerer deleted the Dreamsorcerer-patch-5 branch May 26, 2025 13:34
Copy link
Contributor

patchback bot commented May 26, 2025

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

❌ Failed to cleanly apply 9b671b2 on top of patchback/backports/3.12/9b671b2b37cd4385a3c88faaf1bb25ec0697f77f/pr-11025

Backporting merged PR #11025 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.12/9b671b2b37cd4385a3c88faaf1bb25ec0697f77f/pr-11025 upstream/3.12
  4. Now, cherry-pick PR Move ClientResponse to top of file #11025 contents into that branch:
    $ git cherry-pick -x 9b671b2b37cd4385a3c88faaf1bb25ec0697f77f
    If it'll yell at you with something like fatal: Commit 9b671b2b37cd4385a3c88faaf1bb25ec0697f77f is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 9b671b2b37cd4385a3c88faaf1bb25ec0697f77f
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Move ClientResponse to top of file #11025 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.12/9b671b2b37cd4385a3c88faaf1bb25ec0697f77f/pr-11025
  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.

Copy link
Contributor

patchback bot commented May 26, 2025

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

❌ Failed to cleanly apply 9b671b2 on top of patchback/backports/3.13/9b671b2b37cd4385a3c88faaf1bb25ec0697f77f/pr-11025

Backporting merged PR #11025 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/9b671b2b37cd4385a3c88faaf1bb25ec0697f77f/pr-11025 upstream/3.13
  4. Now, cherry-pick PR Move ClientResponse to top of file #11025 contents into that branch:
    $ git cherry-pick -x 9b671b2b37cd4385a3c88faaf1bb25ec0697f77f
    If it'll yell at you with something like fatal: Commit 9b671b2b37cd4385a3c88faaf1bb25ec0697f77f is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 9b671b2b37cd4385a3c88faaf1bb25ec0697f77f
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Move ClientResponse to top of file #11025 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.13/9b671b2b37cd4385a3c88faaf1bb25ec0697f77f/pr-11025
  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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot backport-3.13 Trigger automatic backporting to the 3.13 release branch by Patchback robot bot:chronographer:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants