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 ANY method not appearing in the UrlDispatcher routes #9987

Merged
merged 5 commits into from
Nov 19, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Nov 19, 2024

Regressed in #9899

The pseudo ANY method should still get added to self._routes and self._allowed_methods because external callers expect to inspect it.

Discovered in aio-libs/aiohttp-apischema#44

@bdraco bdraco added backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot labels Nov 19, 2024
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Nov 19, 2024
@bdraco bdraco changed the title Fix ANY method not appearing in the UrlDispatcher routes Fix ANY method not appearing in the UrlDispatcher routes Nov 19, 2024
CHANGES/9987.bugfix.rst Outdated Show resolved Hide resolved
@bdraco bdraco marked this pull request as ready for review November 19, 2024 14:04
Copy link

codspeed-hq bot commented Nov 19, 2024

CodSpeed Performance Report

Merging #9987 will not alter performance

Comparing any_method_appears_in_routes (ed56b85) with master (4c3b1c6)

Summary

✅ 43 untouched benchmarks

Copy link

codecov bot commented Nov 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.73%. Comparing base (4c3b1c6) to head (ed56b85).
Report is 1 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9987   +/-   ##
=======================================
  Coverage   98.73%   98.73%           
=======================================
  Files         121      121           
  Lines       36728    36732    +4     
  Branches     4384     4384           
=======================================
+ Hits        36262    36266    +4     
  Misses        314      314           
  Partials      152      152           
Flag Coverage Δ
CI-GHA 98.61% <100.00%> (+<0.01%) ⬆️
OS-Linux 98.30% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.13% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.40% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.25% <100.00%> (+<0.01%) ⬆️
Py-3.10.15 97.84% <100.00%> (+0.05%) ⬆️
Py-3.11.10 97.84% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.29% <100.00%> (+<0.01%) ⬆️
Py-3.12.7 98.36% <100.00%> (-0.01%) ⬇️
Py-3.13.0 98.35% <100.00%> (+0.04%) ⬆️
Py-3.9.13 97.17% <100.00%> (+<0.01%) ⬆️
Py-3.9.20 97.76% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.32% <100.00%> (+<0.01%) ⬆️
VM-macos 97.40% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 98.30% <100.00%> (+<0.01%) ⬆️
VM-windows 96.13% <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 enabled auto-merge (squash) November 19, 2024 14:08
@bdraco bdraco merged commit 7199e09 into master Nov 19, 2024
38 of 39 checks passed
@bdraco bdraco deleted the any_method_appears_in_routes branch November 19, 2024 14:13
Copy link
Contributor

patchback bot commented Nov 19, 2024

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

❌ Failed to cleanly apply 7199e09 on top of patchback/backports/3.11/7199e09eceb279a90a1921f9dd784ad7a1d1b805/pr-9987

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

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

❌ Failed to cleanly apply 7199e09 on top of patchback/backports/3.12/7199e09eceb279a90a1921f9dd784ad7a1d1b805/pr-9987

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