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 to 1.18.3 #10078

Merged
merged 1 commit into from
Dec 1, 2024
Merged

Bump yarl to 1.18.3 #10078

merged 1 commit into from
Dec 1, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Dec 1, 2024

Bumping ahead of dependabot to get a new benchmark baseline as cache hit is a lot more likely with this version.

Screenshot 2024-12-01 at 2 46 36 PM

Bumping ahead of dependabot to get a new benchmark baseline
@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 backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot backport:skip Skip backport bot and removed backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot labels Dec 1, 2024
Copy link

codspeed-hq bot commented Dec 1, 2024

CodSpeed Performance Report

Merging #10078 will not alter performance

Comparing bump_yarl1183 (84977ba) with master (1fa237f)

Summary

✅ 44 untouched benchmarks

Copy link

codecov bot commented Dec 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.76%. Comparing base (1fa237f) to head (84977ba).
Report is 1 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #10078   +/-   ##
=======================================
  Coverage   98.76%   98.76%           
=======================================
  Files         121      121           
  Lines       36860    36860           
  Branches     4396     4396           
=======================================
  Hits        36403    36403           
  Misses        311      311           
  Partials      146      146           
Flag Coverage Δ
CI-GHA 98.64% <ø> (ø)
OS-Linux 98.33% <ø> (ø)
OS-Windows 96.18% <ø> (ø)
OS-macOS 97.44% <ø> (+<0.01%) ⬆️
Py-3.10.11 97.29% <ø> (ø)
Py-3.10.15 97.88% <ø> (ø)
Py-3.11.10 97.86% <ø> (-0.01%) ⬇️
Py-3.11.9 97.35% <ø> (+<0.01%) ⬆️
Py-3.12.7 98.39% <ø> (-0.01%) ⬇️
Py-3.13.0 98.37% <ø> (-0.02%) ⬇️
Py-3.9.13 97.20% <ø> (ø)
Py-3.9.20 97.74% <ø> (-0.05%) ⬇️
Py-pypy7.3.16 97.35% <ø> (-0.01%) ⬇️
VM-macos 97.44% <ø> (+<0.01%) ⬆️
VM-ubuntu 98.33% <ø> (ø)
VM-windows 96.18% <ø> (ø)

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 added backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot and removed backport:skip Skip backport bot labels Dec 1, 2024
@bdraco bdraco marked this pull request as ready for review December 1, 2024 20:53
@bdraco bdraco merged commit 0d6a83e into master Dec 1, 2024
49 checks passed
@bdraco bdraco deleted the bump_yarl1183 branch December 1, 2024 20:53
Copy link
Contributor

patchback bot commented Dec 1, 2024

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

❌ Failed to cleanly apply 0d6a83e on top of patchback/backports/3.11/0d6a83e4e6ee9beb99056daa48283d82a7355ee0/pr-10078

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

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

❌ Failed to cleanly apply 0d6a83e on top of patchback/backports/3.12/0d6a83e4e6ee9beb99056daa48283d82a7355ee0/pr-10078

Backporting merged PR #10078 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.12/0d6a83e4e6ee9beb99056daa48283d82a7355ee0/pr-10078 upstream/3.12
  4. Now, cherry-pick PR Bump yarl to 1.18.3 #10078 contents into that branch:
    $ git cherry-pick -x 0d6a83e4e6ee9beb99056daa48283d82a7355ee0
    If it'll yell at you with something like fatal: Commit 0d6a83e4e6ee9beb99056daa48283d82a7355ee0 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 0d6a83e4e6ee9beb99056daa48283d82a7355ee0
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Bump yarl to 1.18.3 #10078 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.12/0d6a83e4e6ee9beb99056daa48283d82a7355ee0/pr-10078
  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 Dec 1, 2024
(cherry picked from commit 0d6a83e)
bdraco added a commit that referenced this pull request Dec 1, 2024
(cherry picked from commit 0d6a83e)
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 backport-3.12 Trigger automatic backporting to the 3.12 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