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

Remove yarl back-compat shims for yarl older than 1.13.0 #9316

Merged
merged 1 commit into from
Sep 27, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Sep 27, 2024

#9305 increased the min version of yarl to 1.13.0 for master and 3.11

Should not backport to 3.10 as we need to keep it there as yarl requirement is 1.12.0+ there

#9305 increased the min version of yarl to 1.13.0
for master and 3.11
@bdraco bdraco added bot:chronographer:skip This PR does not need to include a change note backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Sep 27, 2024
@bdraco bdraco changed the title Remove yarl back-compat for older versions of yarl Remove yarl back-compat for yarl older than 1.13.0 Sep 27, 2024
@bdraco bdraco changed the title Remove yarl back-compat for yarl older than 1.13.0 Remove yarl back-compat shims for yarl older than 1.13.0 Sep 27, 2024
Copy link

codecov bot commented Sep 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.56%. Comparing base (970c5d9) to head (734fbaa).
Report is 1 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9316   +/-   ##
=======================================
  Coverage   98.55%   98.56%           
=======================================
  Files         107      107           
  Lines       34905    34891   -14     
  Branches     4143     4135    -8     
=======================================
- Hits        34402    34390   -12     
+ Misses        335      334    -1     
+ Partials      168      167    -1     
Flag Coverage Δ
CI-GHA 98.45% <100.00%> (+<0.01%) ⬆️
OS-Linux 98.11% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.52% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.80% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.78% <76.92%> (+0.02%) ⬆️
Py-3.10.15 97.71% <76.92%> (+0.01%) ⬆️
Py-3.11.10 97.67% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.74% <100.00%> (-0.01%) ⬇️
Py-3.12.6 98.17% <100.00%> (+<0.01%) ⬆️
Py-3.13.0-rc.2 98.15% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.67% <76.92%> (+0.01%) ⬆️
Py-3.9.20 97.61% <76.92%> (+0.01%) ⬆️
Py-pypy7.3.16 97.23% <76.92%> (+0.01%) ⬆️
VM-macos 97.80% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 98.11% <100.00%> (+<0.01%) ⬆️
VM-windows 96.52% <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 27, 2024 18:08
@bdraco bdraco requested a review from asvetlov as a code owner September 27, 2024 18:08
@bdraco bdraco merged commit c2eb67e into master Sep 27, 2024
40 of 41 checks passed
@bdraco bdraco deleted the remove_back_compat_yarlcode branch September 27, 2024 18:08
Copy link
Contributor

patchback bot commented Sep 27, 2024

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

❌ Failed to cleanly apply c2eb67e on top of patchback/backports/3.11/c2eb67e6956795d8513c577ef90746c6e629f202/pr-9316

Backporting merged PR #9316 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/c2eb67e6956795d8513c577ef90746c6e629f202/pr-9316 upstream/3.11
  4. Now, cherry-pick PR Remove yarl back-compat shims for yarl older than 1.13.0 #9316 contents into that branch:
    $ git cherry-pick -x c2eb67e6956795d8513c577ef90746c6e629f202
    If it'll yell at you with something like fatal: Commit c2eb67e6956795d8513c577ef90746c6e629f202 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x c2eb67e6956795d8513c577ef90746c6e629f202
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Remove yarl back-compat shims for yarl older than 1.13.0 #9316 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/c2eb67e6956795d8513c577ef90746c6e629f202/pr-9316
  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
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:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant