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

Replace code that can now be handled by yarl #9301

Merged
merged 5 commits into from
Sep 27, 2024
Merged

Replace code that can now be handled by yarl #9301

merged 5 commits into from
Sep 27, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Sep 27, 2024

Needs yarl bumped to 1.13.0+

What do these changes do?

  • The manual join of the query string in ClientRequest.send can be replaced with url.raw_path_qs

  • All the IPv6 bracket checks can be replaced with url.host_subcomponent with yarl 1.13.0+

Are there changes in behavior for the user?

no

Is it a substantial burden for the maintainers to support this?

no

- The manual join of the query string in ClientRequest.send
  can be replaced with url.raw_path_qs

- All the IPv6 bracket checks can be replaced with url.host_subcomponent
  with yarl 1.13.0+
aiohttp/client_reqrep.py Outdated Show resolved Hide resolved
@bdraco
Copy link
Member Author

bdraco commented Sep 27, 2024

I'm almost tempted to bump minimum yarl again so we don't have maintain the branching here

bdraco added a commit that referenced this pull request Sep 27, 2024
needed to properly test #9301
Copy link

codecov bot commented Sep 27, 2024

Codecov Report

Attention: Patch coverage is 92.85714% with 2 lines in your changes missing coverage. Please review.

Project coverage is 98.50%. Comparing base (0b8be7f) to head (aed2964).
Report is 3 commits behind head on master.

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
aiohttp/client_reqrep.py 87.50% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9301      +/-   ##
==========================================
- Coverage   98.55%   98.50%   -0.05%     
==========================================
  Files         107      107              
  Lines       34867    34876       +9     
  Branches     4134     4139       +5     
==========================================
- Hits        34364    34356       -8     
- Misses        335      352      +17     
  Partials      168      168              
Flag Coverage Δ
CI-GHA 98.39% <92.85%> (-0.05%) ⬇️
OS-Linux 98.06% <92.85%> (-0.05%) ⬇️
OS-Windows 96.51% <92.85%> (+<0.01%) ⬆️
OS-macOS 97.79% <92.85%> (-0.01%) ⬇️
Py-3.10.11 97.76% <64.28%> (-0.02%) ⬇️
Py-3.10.15 97.69% <64.28%> (-0.02%) ⬇️
Py-3.11.10 97.67% <92.85%> (+<0.01%) ⬆️
Py-3.11.9 97.74% <92.85%> (+<0.01%) ⬆️
Py-3.12.6 98.16% <92.85%> (+<0.01%) ⬆️
Py-3.13.0-rc.2 98.07% <92.85%> (-0.08%) ⬇️
Py-3.9.13 97.65% <64.28%> (-0.02%) ⬇️
Py-3.9.20 97.52% <64.28%> (-0.09%) ⬇️
Py-pypy7.3.16 97.09% <64.28%> (-0.14%) ⬇️
VM-macos 97.79% <92.85%> (-0.01%) ⬇️
VM-ubuntu 98.06% <92.85%> (-0.05%) ⬇️
VM-windows 96.51% <92.85%> (+<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 added a commit that referenced this pull request Sep 27, 2024
needed to properly test #9301
@bdraco bdraco mentioned this pull request Sep 27, 2024
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 27, 2024
@bdraco bdraco added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Sep 27, 2024
@Dreamsorcerer
Copy link
Member

I'm almost tempted to bump minimum yarl again so we don't have maintain the branching here

Just bump it in 3.11 and the branching can sit in the 3.10 release for a short while.

@bdraco bdraco marked this pull request as ready for review September 27, 2024 16:20
@bdraco bdraco merged commit c240b52 into master Sep 27, 2024
37 of 39 checks passed
@bdraco bdraco deleted the yarl_updates branch September 27, 2024 16:20
Copy link
Contributor

patchback bot commented Sep 27, 2024

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

❌ Failed to cleanly apply c240b52 on top of patchback/backports/3.10/c240b52de0505759aa13f2870feb7380d3b50a56/pr-9301

Backporting merged PR #9301 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/c240b52de0505759aa13f2870feb7380d3b50a56/pr-9301 upstream/3.10
  4. Now, cherry-pick PR Replace code that can now be handled by yarl #9301 contents into that branch:
    $ git cherry-pick -x c240b52de0505759aa13f2870feb7380d3b50a56
    If it'll yell at you with something like fatal: Commit c240b52de0505759aa13f2870feb7380d3b50a56 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x c240b52de0505759aa13f2870feb7380d3b50a56
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Replace code that can now be handled by yarl #9301 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/c240b52de0505759aa13f2870feb7380d3b50a56/pr-9301
  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 Sep 27, 2024

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

❌ Failed to cleanly apply c240b52 on top of patchback/backports/3.11/c240b52de0505759aa13f2870feb7380d3b50a56/pr-9301

Backporting merged PR #9301 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/c240b52de0505759aa13f2870feb7380d3b50a56/pr-9301 upstream/3.11
  4. Now, cherry-pick PR Replace code that can now be handled by yarl #9301 contents into that branch:
    $ git cherry-pick -x c240b52de0505759aa13f2870feb7380d3b50a56
    If it'll yell at you with something like fatal: Commit c240b52de0505759aa13f2870feb7380d3b50a56 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x c240b52de0505759aa13f2870feb7380d3b50a56
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Replace code that can now be handled by yarl #9301 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/c240b52de0505759aa13f2870feb7380d3b50a56/pr-9301
  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 Sep 27, 2024
bdraco added a commit that referenced this pull request Sep 27, 2024
bdraco added a commit that referenced this pull request Sep 27, 2024
bdraco added a commit that referenced this pull request Sep 27, 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 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.

2 participants