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

Backport type fix from #9226 #9294

Merged
merged 1 commit into from
Sep 25, 2024
Merged

Backport type fix from #9226 #9294

merged 1 commit into from
Sep 25, 2024

Conversation

Dreamsorcerer
Copy link
Member

No description provided.

@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 25, 2024
@Dreamsorcerer Dreamsorcerer enabled auto-merge (squash) September 25, 2024 18:08
Copy link

codecov bot commented Sep 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.79%. Comparing base (4026191) to head (13764c3).
Report is 1 commits behind head on 3.11.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##             3.11    #9294   +/-   ##
=======================================
  Coverage   97.79%   97.79%           
=======================================
  Files         108      108           
  Lines       34966    34966           
  Branches     4172     4172           
=======================================
  Hits        34195    34195           
  Misses        574      574           
  Partials      197      197           
Flag Coverage Δ
CI-GHA 97.68% <100.00%> (ø)
OS-Linux 97.36% <100.00%> (ø)
OS-Windows 94.94% <ø> (ø)
OS-macOS 97.06% <100.00%> (ø)
Py-3.10.11 97.03% <100.00%> (ø)
Py-3.10.15 96.97% <100.00%> (ø)
Py-3.11.10 96.94% <100.00%> (ø)
Py-3.11.9 97.00% <100.00%> (ø)
Py-3.12.6 97.40% <100.00%> (ø)
Py-3.13.0-rc.2 97.39% <100.00%> (ø)
Py-3.9.13 96.94% <100.00%> (ø)
Py-3.9.20 96.89% <100.00%> (ø)
Py-pypy7.3.16 96.49% <100.00%> (+<0.01%) ⬆️
VM-macos 97.06% <100.00%> (ø)
VM-ubuntu 97.36% <100.00%> (ø)
VM-windows 94.94% <ø> (ø)

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 552dea5 into 3.11 Sep 25, 2024
31 of 32 checks passed
@Dreamsorcerer Dreamsorcerer deleted the Dreamsorcerer-patch-1 branch September 25, 2024 18:31
Copy link
Contributor

patchback bot commented Sep 25, 2024

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

❌ Failed to cleanly apply 552dea5 on top of patchback/backports/3.11/552dea531d06d9388ce7e110a52960c515228b16/pr-9294

Backporting merged PR #9294 into 3.11

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

@Dreamsorcerer Dreamsorcerer added backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot and removed backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Sep 26, 2024
Copy link
Contributor

patchback bot commented Sep 26, 2024

Backport to 3.10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.10/552dea531d06d9388ce7e110a52960c515228b16/pr-9294

Backported as #9299

🤖 @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 26, 2024
(cherry picked from commit 552dea5)
Dreamsorcerer added a commit that referenced this pull request Sep 26, 2024
**This is a backport of PR #9294 as merged into 3.11
(552dea5).**

Co-authored-by: Sam Bull <git@sambull.org>
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 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