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

Increase minimum yarl version to 1.17.0 #9574

Merged
merged 2 commits into from
Oct 28, 2024
Merged

Increase minimum yarl version to 1.17.0 #9574

merged 2 commits into from
Oct 28, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Oct 28, 2024

needs https://github.com/aio-libs/yarl/actions/runs/11561764139

What do these changes do?

We are getting close to releasing aiohttp 3.11.x. Sync to the current yarl release so we can use new features without branching

We are getting close to releasing aiohttp 3.11.x. Sync to the current
yarl release so we can use new features without branching
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Oct 28, 2024
@bdraco bdraco added the backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot label Oct 28, 2024
@bdraco bdraco closed this Oct 28, 2024
@bdraco bdraco reopened this Oct 28, 2024
Copy link

codspeed-hq bot commented Oct 28, 2024

CodSpeed Performance Report

Merging #9574 will not alter performance

Comparing yarl_117 (efc1595) with master (e36c5f0)

Summary

✅ 5 untouched benchmarks

@bdraco bdraco marked this pull request as ready for review October 28, 2024 21:23
@bdraco bdraco enabled auto-merge (squash) October 28, 2024 21:27
Copy link

codecov bot commented Oct 28, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.60%. Comparing base (e36c5f0) to head (efc1595).
Report is 608 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9574   +/-   ##
=======================================
  Coverage   98.60%   98.60%           
=======================================
  Files         113      113           
  Lines       35306    35306           
  Branches     4193     4193           
=======================================
  Hits        34813    34813           
  Misses        331      331           
  Partials      162      162           
Flag Coverage Δ
CI-GHA 98.48% <ø> (ø)
OS-Linux 98.16% <ø> (ø)
OS-Windows 96.05% <ø> (ø)
OS-macOS 97.37% <ø> (-0.01%) ⬇️
Py-3.10.11 97.24% <ø> (+<0.01%) ⬆️
Py-3.10.15 97.64% <ø> (ø)
Py-3.11.10 97.71% <ø> (-0.01%) ⬇️
Py-3.11.9 97.31% <ø> (ø)
Py-3.12.7 98.20% <ø> (ø)
Py-3.13.0 98.18% <ø> (ø)
Py-3.9.13 97.14% <ø> (+<0.01%) ⬆️
Py-3.9.20 97.55% <ø> (ø)
Py-pypy7.3.16 97.17% <ø> (ø)
VM-macos 97.37% <ø> (-0.01%) ⬇️
VM-ubuntu 98.16% <ø> (ø)
VM-windows 96.05% <ø> (ø)

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 merged commit 998204d into master Oct 28, 2024
38 of 39 checks passed
@bdraco bdraco deleted the yarl_117 branch October 28, 2024 21:45
Copy link
Contributor

patchback bot commented Oct 28, 2024

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

❌ Failed to cleanly apply 998204d on top of patchback/backports/3.11/998204df30027a1c653b898c6f2eb8a68357bef5/pr-9574

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