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 uvloop #9276

Merged
merged 2 commits into from
Sep 24, 2024
Merged

Bump uvloop #9276

merged 2 commits into from
Sep 24, 2024

Conversation

Dreamsorcerer
Copy link
Member

For 3.13 testing

@Dreamsorcerer Dreamsorcerer 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 24, 2024
@Dreamsorcerer Dreamsorcerer added the backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot label Sep 24, 2024
Copy link

codecov bot commented Sep 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.41%. Comparing base (947b9c4) to head (8e26e39).
Report is 2 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9276   +/-   ##
=======================================
  Coverage   98.41%   98.41%           
=======================================
  Files         107      107           
  Lines       34828    34828           
  Branches     4132     4132           
=======================================
  Hits        34277    34277           
  Misses        380      380           
  Partials      171      171           
Flag Coverage Δ
CI-GHA 98.30% <ø> (ø)
OS-Linux 97.97% <ø> (ø)
OS-Windows 96.37% <ø> (+<0.01%) ⬆️
OS-macOS 97.65% <ø> (-0.01%) ⬇️
Py-3.10.11 97.63% <ø> (+<0.01%) ⬆️
Py-3.10.15 97.56% <ø> (ø)
Py-3.11.10 97.53% <ø> (ø)
Py-3.11.9 97.60% <ø> (-0.01%) ⬇️
Py-3.12.6 98.02% <ø> (ø)
Py-3.13.0-rc.2 98.00% <ø> (?)
Py-3.9.13 97.52% <ø> (-0.01%) ⬇️
Py-3.9.20 97.46% <ø> (ø)
Py-pypy7.3.16 97.08% <ø> (ø)
VM-macos 97.65% <ø> (-0.01%) ⬇️
VM-ubuntu 97.97% <ø> (ø)
VM-windows 96.37% <ø> (+<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.

@Dreamsorcerer Dreamsorcerer merged commit ccbd2c5 into master Sep 24, 2024
38 of 39 checks passed
@Dreamsorcerer Dreamsorcerer deleted the bump-uvloop branch September 24, 2024 12:50
Copy link
Contributor

patchback bot commented Sep 24, 2024

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

❌ Failed to cleanly apply ccbd2c5 on top of patchback/backports/3.10/ccbd2c5e3364dbf0425f097ae911ab84f44758dc/pr-9276

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

Backport to 3.11: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.11/ccbd2c5e3364dbf0425f097ae911ab84f44758dc/pr-9276

Backported as #9277

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Sep 24, 2024
(cherry picked from commit ccbd2c5)
Dreamsorcerer added a commit that referenced this pull request Sep 24, 2024
(cherry picked from commit ccbd2c5)
Dreamsorcerer added a commit that referenced this pull request Sep 24, 2024
**This is a backport of PR #9276 as merged into master
(ccbd2c5).**

Co-authored-by: Sam Bull <git@sambull.org>
Dreamsorcerer added a commit that referenced this pull request Sep 24, 2024
(cherry picked from commit ccbd2c5)
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.

2 participants