Skip to content

Small improvements to payload cleanup fixture #10943

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 2 commits into from
May 22, 2025
Merged

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented May 22, 2025

@bdraco bdraco added the backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot label May 22, 2025
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label May 22, 2025
@bdraco bdraco removed the bot:chronographer:provided There is a change note present in this PR label May 22, 2025
@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

codspeed-hq bot commented May 22, 2025

CodSpeed Performance Report

Merging #10943 will not alter performance

Comparing payload_cleanup_fixtures (94321af) with master (6512aaa)

Summary

✅ 59 untouched benchmarks

Copy link

codecov bot commented May 22, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.77%. Comparing base (597161d) to head (94321af).
Report is 3 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #10943   +/-   ##
=======================================
  Coverage   98.76%   98.77%           
=======================================
  Files         129      129           
  Lines       39455    39458    +3     
  Branches     2184     2185    +1     
=======================================
+ Hits        38967    38973    +6     
+ Misses        340      337    -3     
  Partials      148      148           
Flag Coverage Δ
CI-GHA 98.65% <100.00%> (+<0.01%) ⬆️
OS-Linux 98.36% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.53% <100.00%> (-0.01%) ⬇️
OS-macOS 97.51% <66.66%> (-0.01%) ⬇️
Py-3.10.11 97.40% <100.00%> (-0.01%) ⬇️
Py-3.10.17 97.93% <100.00%> (-0.01%) ⬇️
Py-3.11.12 97.97% <100.00%> (-0.05%) ⬇️
Py-3.11.9 97.48% <100.00%> (-0.01%) ⬇️
Py-3.12.10 98.42% <100.00%> (-0.01%) ⬇️
Py-3.13.3 98.41% <100.00%> (-0.01%) ⬇️
Py-3.9.13 97.27% <100.00%> (-0.01%) ⬇️
Py-3.9.22 97.80% <100.00%> (-0.01%) ⬇️
Py-pypy7.3.16 97.36% <100.00%> (+4.47%) ⬆️
VM-macos 97.51% <66.66%> (-0.01%) ⬇️
VM-ubuntu 98.36% <100.00%> (+<0.01%) ⬆️
VM-windows 96.53% <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.

@bdraco bdraco marked this pull request as ready for review May 22, 2025 18:37
@bdraco bdraco requested review from webknjaz and asvetlov as code owners May 22, 2025 18:37
@bdraco bdraco merged commit b1e9462 into master May 22, 2025
44 checks passed
@bdraco bdraco deleted the payload_cleanup_fixtures branch May 22, 2025 18:37
Copy link
Contributor

patchback bot commented May 22, 2025

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

❌ Failed to cleanly apply b1e9462 on top of patchback/backports/3.12/b1e94620e2995d2d8f9f6dae5ea793e3279f04c2/pr-10943

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