Skip to content
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

Fix system routes polluting the middleware cache #9852

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Nov 13, 2024

Fix system routes polluting the middleware cache

@bdraco bdraco added backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Nov 13, 2024
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Nov 13, 2024
Copy link

codspeed-hq bot commented Nov 13, 2024

CodSpeed Performance Report

Merging #9852 will not alter performance

Comparing middleware_fix (fc895c4) with master (a9a0d84)

Summary

✅ 24 untouched benchmarks

@bdraco bdraco marked this pull request as ready for review November 13, 2024 14:14
@bdraco bdraco enabled auto-merge (squash) November 13, 2024 14:14
Copy link

codecov bot commented Nov 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.70%. Comparing base (a9a0d84) to head (fc895c4).
Report is 2 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9852   +/-   ##
=======================================
  Coverage   98.70%   98.70%           
=======================================
  Files         118      118           
  Lines       36261    36277   +16     
  Branches     4311     4312    +1     
=======================================
+ Hits        35793    35809   +16     
  Misses        315      315           
  Partials      153      153           
Flag Coverage Δ
CI-GHA 98.59% <100.00%> (+<0.01%) ⬆️
OS-Linux 98.29% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.08% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.36% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.21% <100.00%> (+<0.01%) ⬆️
Py-3.10.15 97.76% <100.00%> (-0.06%) ⬇️
Py-3.11.10 97.80% <100.00%> (-0.01%) ⬇️
Py-3.11.9 97.27% <100.00%> (-0.01%) ⬇️
Py-3.12.7 98.35% <100.00%> (+<0.01%) ⬆️
Py-3.13.0 98.29% <100.00%> (-0.06%) ⬇️
Py-3.9.13 97.13% <100.00%> (-0.01%) ⬇️
Py-3.9.20 97.68% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.30% <100.00%> (+<0.01%) ⬆️
VM-macos 97.36% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 98.29% <100.00%> (+<0.01%) ⬆️
VM-windows 96.08% <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 disabled auto-merge November 13, 2024 14:19
@bdraco bdraco merged commit 249855a into master Nov 13, 2024
40 of 41 checks passed
@bdraco bdraco deleted the middleware_fix branch November 13, 2024 14:24
Copy link
Contributor

patchback bot commented Nov 13, 2024

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

❌ Failed to cleanly apply 249855a on top of patchback/backports/3.10/249855ad9cdbdb3d6eca90a0a5b675c409274ab6/pr-9852

Backporting merged PR #9852 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.10/249855ad9cdbdb3d6eca90a0a5b675c409274ab6/pr-9852 upstream/3.10
  4. Now, cherry-pick PR Fix system routes polluting the middleware cache #9852 contents into that branch:
    $ git cherry-pick -x 249855ad9cdbdb3d6eca90a0a5b675c409274ab6
    If it'll yell at you with something like fatal: Commit 249855ad9cdbdb3d6eca90a0a5b675c409274ab6 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 249855ad9cdbdb3d6eca90a0a5b675c409274ab6
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix system routes polluting the middleware cache #9852 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/249855ad9cdbdb3d6eca90a0a5b675c409274ab6/pr-9852
  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 Nov 13, 2024

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

❌ Failed to cleanly apply 249855a on top of patchback/backports/3.11/249855ad9cdbdb3d6eca90a0a5b675c409274ab6/pr-9852

Backporting merged PR #9852 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.11/249855ad9cdbdb3d6eca90a0a5b675c409274ab6/pr-9852 upstream/3.11
  4. Now, cherry-pick PR Fix system routes polluting the middleware cache #9852 contents into that branch:
    $ git cherry-pick -x 249855ad9cdbdb3d6eca90a0a5b675c409274ab6
    If it'll yell at you with something like fatal: Commit 249855ad9cdbdb3d6eca90a0a5b675c409274ab6 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 249855ad9cdbdb3d6eca90a0a5b675c409274ab6
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix system routes polluting the middleware cache #9852 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/249855ad9cdbdb3d6eca90a0a5b675c409274ab6/pr-9852
  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 Nov 13, 2024
bdraco added a commit that referenced this pull request Nov 13, 2024
bdraco added a commit that referenced this pull request Nov 13, 2024
bdraco added a commit that referenced this pull request Nov 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 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