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

Use URL.extend_query to add params in ClientRequest #9068

Merged
merged 5 commits into from
Sep 9, 2024
Merged

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Sep 8, 2024

What do these changes do?

Use URL.extend_query to add params in ClientRequest

Are there changes in behavior for the user?

no

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

no

@bdraco bdraco changed the title Use URL.extend_query to add params for in ClientRequest Use URL.extend_query to add params in ClientRequest Sep 8, 2024
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 8, 2024
@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 Sep 8, 2024
aiohttp/client_reqrep.py Outdated Show resolved Hide resolved
Copy link
Member

@Dreamsorcerer Dreamsorcerer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd be tempted to just move this to 3.11 and increase the minimum yarl version (or do this in 3.10 and remove the old path in 3.11), as these kind of checks tend to be forgotten about for years after they're useful. We can do the same for using the Query type.

@bdraco

This comment was marked as outdated.

@bdraco bdraco mentioned this pull request Sep 8, 2024
Copy link

codecov bot commented Sep 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.30%. Comparing base (7fb1631) to head (fbd50e7).
Report is 1 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9068   +/-   ##
=======================================
  Coverage   98.30%   98.30%           
=======================================
  Files         107      107           
  Lines       34390    34397    +7     
  Branches     4075     4081    +6     
=======================================
+ Hits        33806    33813    +7     
  Misses        412      412           
  Partials      172      172           
Flag Coverage Δ
CI-GHA 98.19% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.86% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.27% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.53% <100.00%> (-0.01%) ⬇️
Py-3.10.11 97.63% <100.00%> (+<0.01%) ⬆️
Py-3.10.14 97.56% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.79% <100.00%> (+<0.01%) ⬆️
Py-3.12.5 97.91% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.52% <100.00%> (+<0.01%) ⬆️
Py-3.9.19 97.46% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.07% <100.00%> (+<0.01%) ⬆️
VM-macos 97.53% <100.00%> (-0.01%) ⬇️
VM-ubuntu 97.86% <100.00%> (+<0.01%) ⬆️
VM-windows 96.27% <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 September 9, 2024 00:34
@bdraco bdraco merged commit 841d00e into master Sep 9, 2024
34 of 35 checks passed
@bdraco bdraco deleted the extend_query_yarl branch September 9, 2024 00:34
Copy link
Contributor

patchback bot commented Sep 9, 2024

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

❌ Failed to cleanly apply 841d00e on top of patchback/backports/3.10/841d00eb3c5393fc6eccbfcd09114b14c74772d4/pr-9068

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

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

❌ Failed to cleanly apply 841d00e on top of patchback/backports/3.11/841d00eb3c5393fc6eccbfcd09114b14c74772d4/pr-9068

Backporting merged PR #9068 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/841d00eb3c5393fc6eccbfcd09114b14c74772d4/pr-9068 upstream/3.11
  4. Now, cherry-pick PR Use URL.extend_query to add params in ClientRequest #9068 contents into that branch:
    $ git cherry-pick -x 841d00eb3c5393fc6eccbfcd09114b14c74772d4
    If it'll yell at you with something like fatal: Commit 841d00eb3c5393fc6eccbfcd09114b14c74772d4 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 841d00eb3c5393fc6eccbfcd09114b14c74772d4
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Use URL.extend_query to add params in ClientRequest #9068 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/841d00eb3c5393fc6eccbfcd09114b14c74772d4/pr-9068
  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 9, 2024
bdraco added a commit that referenced this pull request Sep 9, 2024
bdraco added a commit that referenced this pull request Sep 9, 2024
bdraco added a commit that referenced this pull request Sep 9, 2024
@bdraco
Copy link
Member Author

bdraco commented Sep 9, 2024

Pretty significant drop on the profile 👍
Screenshot 2024-09-08 at 9 11 58 PM

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.

2 participants