8000 Fix missing text in #9368 changelog message by bdraco · Pull Request #9385 · aio-libs/aiohttp · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix missing text in #9368 changelog message #9385

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Oct 1, 2024
Merged

Fix missing text in #9368 changelog message #9385

merged 2 commits into from
Oct 1, 2024

Conversation

bdraco
Copy link
Member
@bdraco bdraco commented Oct 1, 2024

Fix missing text in #9368 changelog message

@bdraco bdraco added bot:chronographer:skip This PR does not need to include a change note backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Oct 1, 2024
bdraco
bdraco commented Oct 1, 2024
View reviewed changes
@bdraco bdraco marked this pull request as ready for review October 1, 2024 19:01
@bdraco bdraco enabled auto-merge (squash) October 1, 2024 19:01
@codecov Codecov
Copy link
codecov bot commented Oct 1, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.56%. Comparing base (d684195) to head (61ce625).
Report is 715 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #9385   +/-   ##
=======================================
  Coverage   98.56%   98.56%           
=======================================
  Files         107      107           
  Lines       34995    34995           
  Branches     4146     4146           
=======================================
  Hits        34492    34492           
  Misses        335      335           
  Partials      168      168
Flag Coverage Δ
CI-GHA 98.44% <ø> (ø)
OS-Linux 98.10% <ø> (ø)
OS-Windows 96.52% <ø> (ø)
OS-macOS 97.79% <ø> (ø)
Py-3.10.11 97.67% <ø> (+<0.01%) ⬆️
Py-3.10.15 97.60% <ø> (ø)
Py-3.11.10 97.66% <ø> (-0.01%) ⬇️
Py-3.11.9 97.74% <ø> (+<0.01%) ⬆️
Py-3.12.6 98.15% <ø> (ø)
Py-3.13.0-rc.2 98.14% <ø> (ø)
Py-3.9.13 97.56% <ø> (-0.01%) ⬇️
Py-3.9.20 97.50% <ø> (ø)
Py-pypy7.3.16 97.12% <ø> (ø)
VM-macos 97.79% <ø> (ø)
VM-ubuntu 98.10% <ø> (ø)
VM-windows 96.52% <ø> (ø)

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 8a583ed into master Oct 1, 2024
35 of 36 checks passed
@bdraco bdraco deleted the changelog_9368 branch October 1, 2024 20:09
@patchback Patchback
Copy link
Contributor
patchback bot commented Oct 1, 2024 •
edited
Loading

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

❌ Failed to cleanly apply 8a583ed on top of patchback/backports/3.10/8a583ed13447162138e9c17ba7c62e87fa966aaa/pr-9385

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

@patchback Patchback
Copy link
Contributor
patchback bot commented Oct 1, 2024 •
edited
Loading

Backport to 3.11: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.11/8a583ed13447162138e9c17ba7c62e87fa966aaa/pr-9385

Backported as #9387

🤖 @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 Oct 1, 2024
@bdraco @patchback
Fix missing text in #9368 changelog message (#9385)
8cc1ad6 
(cherry picked from commit 8a583ed)
@patchback patchback bot mentioned this pull request Oct 1, 2024
Merged
@bdraco
Copy link
Member Author
bdraco commented Oct 1, 2024

3.10 backport not needed since #9378 was fixed before it merged

bdraco added a commit that referenced this pull request Oct 1, 2024
@patchback @bdraco
[PR #9385/8a583ed1 backport][3.11] Fix missing text in #9368 changelo…
72b90b0 
…g message (#9387)

Co-authored-by: J. Nick Koston <nick@koston.org>
Fix missing text in #9368 changelog message
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@webknjaz webknjaz Awaiting requested review from webknjaz webknjaz is a code owner

@asvetlov asvetlov Awaiting requested review from asvetlov asvetlov is a code owner

Assignees
No one assigned
Labels
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@bdraco
0