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

Fix warning displayed by default #7677

Merged
merged 5 commits into from
Oct 26, 2023
Merged

Fix warning displayed by default #7677

merged 5 commits into from
Oct 26, 2023

Conversation

Dreamsorcerer
Copy link
Member

No description provided.

@Dreamsorcerer Dreamsorcerer added the backport-3.9 Trigger automatic backporting to the 3.9 release branch by Patchback robot label Oct 8, 2023
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Oct 8, 2023
@Dreamsorcerer Dreamsorcerer mentioned this pull request Oct 8, 2023
8 tasks
@codecov
Copy link

codecov bot commented Oct 8, 2023

Codecov Report

Merging #7677 (c0a91f6) into master (0dc39e4) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master    #7677   +/-   ##
=======================================
  Coverage   97.36%   97.36%           
=======================================
  Files         106      106           
  Lines       31718    31722    +4     
  Branches     3633     3633           
=======================================
+ Hits        30881    30885    +4     
  Misses        633      633           
  Partials      204      204           
Flag Coverage Δ
CI-GHA 97.28% <100.00%> (+<0.01%) ⬆️
OS-Linux 96.95% <100.00%> (+<0.01%) ⬆️
OS-Windows 95.42% <100.00%> (+<0.01%) ⬆️
OS-macOS 96.61% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 95.35% <100.00%> (+<0.01%) ⬆️
Py-3.10.13 96.81% <100.00%> (+<0.01%) ⬆️
Py-3.11.6 96.48% <100.00%> (+<0.01%) ⬆️
Py-3.8.10 95.32% <100.00%> (+<0.01%) ⬆️
Py-3.8.18 96.74% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 95.31% <100.00%> (+<0.01%) ⬆️
Py-3.9.18 96.77% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.11 96.17% <100.00%> (+<0.01%) ⬆️
VM-macos 96.61% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 96.95% <100.00%> (+<0.01%) ⬆️
VM-windows 95.42% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
aiohttp/web.py 99.17% <100.00%> (+0.01%) ⬆️
aiohttp/web_app.py 95.25% <100.00%> (+0.01%) ⬆️
aiohttp/web_exceptions.py 98.59% <100.00%> (+<0.01%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@Dreamsorcerer Dreamsorcerer added this to the 3.9 milestone Oct 8, 2023
@Dreamsorcerer Dreamsorcerer added this pull request to the merge queue Oct 26, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Oct 26, 2023
@Dreamsorcerer Dreamsorcerer added this pull request to the merge queue Oct 26, 2023
@webknjaz
Copy link
Member

@Dreamsorcerer you don't have to merge in master anymore. The problem is with the checks not being reported.

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Oct 26, 2023
@webknjaz webknjaz merged commit 32a1bae into master Oct 26, 2023
29 of 34 checks passed
@webknjaz webknjaz deleted the fix-warning-display branch October 26, 2023 20:02
@patchback
Copy link
Contributor

patchback bot commented Oct 26, 2023

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

❌ Failed to cleanly apply 32a1bae on top of patchback/backports/3.9/32a1bae0e7513a7708708c41ee4b93fc3c9952cf/pr-7677

Backporting merged PR #7677 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.9/32a1bae0e7513a7708708c41ee4b93fc3c9952cf/pr-7677 upstream/3.9
  4. Now, cherry-pick PR Fix warning displayed by default #7677 contents into that branch:
    $ git cherry-pick -x 32a1bae0e7513a7708708c41ee4b93fc3c9952cf
    If it'll yell at you with something like fatal: Commit 32a1bae0e7513a7708708c41ee4b93fc3c9952cf is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 32a1bae0e7513a7708708c41ee4b93fc3c9952cf
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix warning displayed by default #7677 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.9/32a1bae0e7513a7708708c41ee4b93fc3c9952cf/pr-7677
  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 added a commit that referenced this pull request Oct 26, 2023
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
(cherry picked from commit 32a1bae)
Dreamsorcerer added a commit that referenced this pull request Oct 26, 2023
Co-authored-by: pre-commit-ci[bot]
<66853113+pre-commit-ci[bot]@users.noreply.github.com>
(cherry picked from commit 32a1bae)
xiangxli pushed a commit to xiangxli/aiohttp that referenced this pull request Dec 4, 2023
Co-authored-by: pre-commit-ci[bot]
<66853113+pre-commit-ci[bot]@users.noreply.github.com>
(cherry picked from commit 32a1bae)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.9 Trigger automatic backporting to the 3.9 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.

None yet

2 participants