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

Bump yarl requirement to >=1.11.0 #9079

Merged
merged 3 commits into from
Sep 9, 2024
Merged

Bump yarl requirement to >=1.11.0 #9079

merged 3 commits into from
Sep 9, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Sep 9, 2024

This will allow us to remove some conditional logic to support old yarl versions. #9068 (comment)

Should not backport to 3.10, master/3.11 only

@bdraco bdraco added the backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot label Sep 9, 2024
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 9, 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 (a33270b) to head (43196f7).
Report is 2 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9079   +/-   ##
=======================================
  Coverage   98.30%   98.30%           
=======================================
  Files         107      107           
  Lines       34412    34412           
  Branches     4080     4080           
=======================================
  Hits        33828    33828           
  Misses        412      412           
  Partials      172      172           
Flag Coverage Δ
CI-GHA 98.19% <ø> (ø)
OS-Linux 97.86% <ø> (ø)
OS-Windows 96.27% <ø> (ø)
OS-macOS 97.53% <ø> (+<0.01%) ⬆️
Py-3.10.11 97.63% <ø> (ø)
Py-3.10.14 97.57% <ø> (ø)
Py-3.11.9 97.79% <ø> (ø)
Py-3.12.5 97.91% <ø> (ø)
Py-3.9.13 97.52% <ø> (ø)
Py-3.9.19 97.46% <ø> (ø)
Py-pypy7.3.16 97.07% <ø> (ø)
VM-macos 97.53% <ø> (+<0.01%) ⬆️
VM-ubuntu 97.86% <ø> (ø)
VM-windows 96.27% <ø> (ø)

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 02:33
@bdraco bdraco enabled auto-merge (squash) September 9, 2024 02:34
@bdraco bdraco merged commit 7404afc into master Sep 9, 2024
30 of 31 checks passed
@bdraco bdraco deleted the bump_yarl_req branch September 9, 2024 02:47
Copy link
Contributor

patchback bot commented Sep 9, 2024

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

❌ Failed to cleanly apply 7404afc on top of patchback/backports/3.11/7404afcf9f6303eb288d3254b5fdd89a656c5ded/pr-9079

Backporting merged PR #9079 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/7404afcf9f6303eb288d3254b5fdd89a656c5ded/pr-9079 upstream/3.11
  4. Now, cherry-pick PR Bump yarl requirement to >=1.11.0 #9079 contents into that branch:
    $ git cherry-pick -x 7404afcf9f6303eb288d3254b5fdd89a656c5ded
    If it'll yell at you with something like fatal: Commit 7404afcf9f6303eb288d3254b5fdd89a656c5ded is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 7404afcf9f6303eb288d3254b5fdd89a656c5ded
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Bump yarl requirement to >=1.11.0 #9079 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/7404afcf9f6303eb288d3254b5fdd89a656c5ded/pr-9079
  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
#9079 increased the yarl minimum version so we can remove these shims
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.

1 participant