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.

Sign up for GitHub

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

Jump to bottom

Revert "Only construct the allowed_methods set once for a StaticResource" #9972

Merged
merged 4 commits into from
Nov 19, 2024
Merged

Revert "Only construct the allowed_methods set once for a StaticResource" #9972

merged 4 commits into from
Nov 19, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Nov 19, 2024

Reverts #9911

aiohttp-cors accesses the protected self._routes here and relies on being able to add new methods
https://github.com/aio-libs/aiohttp-cors/blob/38c6c17bffc805e46baccd7be1b4fd8c69d95dc3/aiohttp_cors/urldispatcher_router_adapter.py#L187

@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 commented Nov 19, 2024
View reviewed changes
CHANGES/9972.bugfix.rst Outdated Show resolved Hide resolved
bdraco
bdraco commented Nov 19, 2024
View reviewed changes
aiohttp/web_urldispatcher.py Outdated Show resolved Hide resolved
@bdraco bdraco mentioned this pull request Nov 19, 2024
Merged
19 tasks
@codspeed-hq CodSpeed HQ
Copy link

codspeed-hq bot commented Nov 19, 2024

CodSpeed Performance Report

Merging #9972 will not alter performance

Comparing revert-9911-set_once_static_resolve (9598bc8) with master (4e8324e)

Summary

✅ 43 untouched benchmarks

@codecov Codecov
Copy link

codecov bot commented Nov 19, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.73%. Comparing base (4e8324e) to head (9598bc8).
Report is 1 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #9972      +/-   ##
==========================================
- Coverage   98.73%   98.73%   -0.01%     
==========================================
  Files         121      121              
  Lines       36715    36714       -1     
  Branches     4383     4383              
==========================================
- Hits        36249    36248       -1     
  Misses        314      314              
  Partials      152      152
Flag Coverage Δ
CI-GHA 98.62% <100.00%> (-0.01%) ⬇️
OS-Linux 98.31% <100.00%> (-0.01%) ⬇️
OS-Windows 96.13% <100.00%> (-0.01%) ⬇️
OS-macOS 97.41% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.26% <100.00%> (+<0.01%) ⬆️
Py-3.10.15 97.85% <100.00%> (+0.05%) ⬆️
Py-3.11.10 97.84% <100.00%> (-0.01%) ⬇️
Py-3.11.9 97.30% <100.00%> (+0.01%) ⬆️
Py-3.12.7 98.37% <100.00%> (-0.01%) ⬇️
Py-3.13.0 98.36% <100.00%> (-0.01%) ⬇️
Py-3.9.13 97.17% <100.00%> (+<0.01%) ⬆️
Py-3.9.20 97.72% <100.00%> (-0.05%) ⬇️
Py-pypy7.3.16 97.32% <100.00%> (-0.01%) ⬇️
VM-macos 97.41% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 98.31% <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 merged commit 9916d32 into master Nov 19, 2024
40 of 41 checks passed
@bdraco bdraco deleted the revert-9911-set_once_static_resolve branch November 19, 2024 04:34
@patchback Patchback
Copy link
Contributor

patchback bot commented Nov 19, 2024 •
edited
Loading

Backport to 3.11: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.11/9916d3298e84ea8fe8e5600b4b858b2829d21155/pr-9972

Backported as #9973

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Nov 19, 2024
@bdraco @patchback
Revert "Only construct the allowed_methods set once for a `Static…
44e2611 
…Resource`" (#9972)

(cherry picked from commit 9916d32)
@patchback Patchback
Copy link
Contributor

patchback bot commented Nov 19, 2024 •
edited
Loading

Backport to 3.12: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.12/9916d3298e84ea8fe8e5600b4b858b2829d21155/pr-9972

Backported as #9974

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback patchback bot mentioned this pull request Nov 19, 2024
Merged
patchback bot pushed a commit that referenced this pull request Nov 19, 2024
@bdraco @patchback
Revert "Only construct the allowed_methods set once for a `Static…
0a75df3 
…Resource`" (#9972)

(cherry picked from commit 9916d32)
@patchback patchback bot mentioned this pull request Nov 19, 2024
Merged
@bdraco bdraco mentioned this pull request Nov 19, 2024
Merged
bdraco added a commit that referenced this pull request Nov 19, 2024
@patchback @bdraco
[PR #9972/9916d329 backport][3.11] Revert "Only construct the `allowe…
39f6832 
…d_methods` `set` once for a `StaticResource`" (#9973)

Co-authored-by: J. Nick Koston <[email protected]>
bdraco added a commit that referenced this pull request Nov 19, 2024
@patchback @bdraco
[PR #9972/9916d329 backport][3.12] Revert "Only construct the `allowe…
007d9b1 
…d_methods` `set` once for a `StaticResource`" (#9974)

Co-authored-by: J. Nick Koston <[email protected]>
bdraco added a commit that referenced this pull request Nov 19, 2024
@bdraco
Restore only construct the allowed_methods set once for a `StaticReso…
fc37799 
…urce`

Was reverted in #9972 because it introduced a regression with adding
and OPTIONS method. Fix the ``set_options_route`` call instead and
restore the change. There is now test coverage for this case as well
via #9975
@bdraco bdraco mentioned this pull request Nov 19, 2024
Merged
This was referenced Nov 19, 2024
Merged
Merged
@Dreamsorcerer
Copy link
Member

aiohttp-cors accesses the protected self._routes here and relies on being able to add new methods

We could just update that library?

@bdraco bdraco mentioned this pull request Nov 26, 2024
Open
@bdraco
Copy link
Member Author

bdraco commented Nov 26, 2024

Created an issue for that aio-libs/aiohttp-cors#483

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asvetlov asvetlov Awaiting requested review from asvetlov asvetlov is a code owner

@webknjaz webknjaz Awaiting requested review from webknjaz webknjaz is a code owner

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bdraco @Dreamsorcerer