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 unused backwards compatibility code for old yarl versions #9083

Merged
merged 2 commits into from
Sep 9, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Sep 9, 2024

What do these changes do?

#9068 (comment)
Remove unused backwards compatibility code for old yarl versions
#9079 increased the yarl minimum version so we can remove these shims

Are there changes in behavior for the user?

no

#9079 increased the yarl minimum version so we can remove these shims
@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 9, 2024
@bdraco bdraco changed the title Remove unused backwards compatibility code for old yarl versions [3.11] Remove unused backwards compatibility code for old yarl versions Sep 9, 2024
@bdraco bdraco changed the title [3.11] Remove unused backwards compatibility code for old yarl versions Remove unused backwards compatibility code for old yarl versions 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 (7404afc) to head (2bf133f).
Report is 75 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9083      +/-   ##
==========================================
- Coverage   98.30%   98.30%   -0.01%     
==========================================
  Files         107      107              
  Lines       34415    34403      -12     
  Branches     4080     4074       -6     
==========================================
- Hits        33831    33819      -12     
  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 enabled auto-merge (squash) September 9, 2024 03:40
@bdraco bdraco merged commit a6dd415 into master Sep 9, 2024
31 of 32 checks passed
@bdraco bdraco deleted the remove_back_compat_old_yarl branch September 9, 2024 03:47
Copy link
Contributor

patchback bot commented Sep 9, 2024

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

❌ Failed to cleanly apply a6dd415 on top of patchback/backports/3.11/a6dd415a1401c82722aed12b86ab878e9afb017f/pr-9083

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

bdraco commented Sep 24, 2024

We ended up having to bump yarl in 3.10 for path_safe anyways so we should backport this as well.

@bdraco
Copy link
Member Author

bdraco commented Sep 24, 2024

I'll add the tag after the release is done to not tie up the CI

@bdraco bdraco added the backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot label Sep 24, 2024
Copy link
Contributor

patchback bot commented Sep 24, 2024

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

❌ Failed to cleanly apply a6dd415 on top of patchback/backports/3.10/a6dd415a1401c82722aed12b86ab878e9afb017f/pr-9083

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