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

Use PathLike #6876

Merged
merged 17 commits into from
Nov 29, 2022
Merged

Use PathLike #6876

merged 17 commits into from
Nov 29, 2022

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.9 labels Aug 8, 2022
aiohttp/web.py Outdated Show resolved Hide resolved
@Dreamsorcerer Dreamsorcerer marked this pull request as ready for review August 8, 2022 18:11
@Dreamsorcerer Dreamsorcerer requested a review from asvetlov as a code owner August 8, 2022 18:11
@lgtm-com
Copy link
Contributor

lgtm-com bot commented Aug 8, 2022

This pull request introduces 3 alerts when merging 0efe15d into 799dc87 - view on LGTM.com

new alerts:

  • 3 for Unused import

@Dreamsorcerer Dreamsorcerer mentioned this pull request Aug 8, 2022
5 tasks
@lgtm-com
Copy link
Contributor

lgtm-com bot commented Nov 20, 2022

This pull request introduces 1 alert when merging c3d53a2 into c0a7666 - view on LGTM.com

new alerts:

  • 1 for Unused import

Heads-up: LGTM.com's PR analysis will be disabled on the 5th of December, and LGTM.com will be shut down ⏻ completely on the 16th of December 2022. Please enable GitHub code scanning, which uses the same CodeQL engine ⚙️ that powers LGTM.com. For more information, please check out our post on the GitHub blog.

@codecov
Copy link

codecov bot commented Nov 28, 2022

Codecov Report

Merging #6876 (d923b0a) into master (c0a7666) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #6876      +/-   ##
==========================================
- Coverage   97.50%   97.50%   -0.01%     
==========================================
  Files         103      103              
  Lines       29999    30043      +44     
  Branches     3651     3659       +8     
==========================================
+ Hits        29252    29294      +42     
- Misses        567      568       +1     
- Partials      180      181       +1     
Flag Coverage Δ
CI-GHA 97.41% <100.00%> (-0.01%) ⬇️
OS-Linux 97.04% <100.00%> (-0.02%) ⬇️
OS-Windows 95.34% <100.00%> (-0.06%) ⬇️
OS-macOS 96.63% <100.00%> (-0.06%) ⬇️
Py-3.10.8 97.16% <100.00%> (-0.07%) ⬇️
Py-3.11.0 96.55% <100.00%> (-0.01%) ⬇️
Py-3.7.15 96.88% <100.00%> (-0.01%) ⬇️
Py-3.7.9 95.23% <100.00%> (-0.06%) ⬇️
Py-3.8.10 95.13% <100.00%> (-0.06%) ⬇️
Py-3.8.14 96.77% <100.00%> (-0.01%) ⬇️
Py-3.9.13 95.12% <100.00%> (-0.06%) ⬇️
Py-3.9.14 96.52% <100.00%> (-0.06%) ⬇️
Py-3.9.15 96.75% <100.00%> (-0.01%) ⬇️
Py-pypy7.3.9 96.38% <100.00%> (-0.06%) ⬇️
VM-macos 96.63% <100.00%> (-0.06%) ⬇️
VM-ubuntu 97.04% <100.00%> (-0.02%) ⬇️
VM-windows 95.34% <100.00%> (-0.06%) ⬇️

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

Impacted Files Coverage Δ
aiohttp/web.py 99.18% <100.00%> (+<0.01%) ⬆️
aiohttp/web_fileresponse.py 99.29% <100.00%> (+1.37%) ⬆️
aiohttp/web_runner.py 97.75% <100.00%> (ø)
aiohttp/web_urldispatcher.py 97.82% <100.00%> (-0.01%) ⬇️
tests/test_web_sendfile.py 100.00% <100.00%> (ø)
aiohttp/__init__.py 92.85% <0.00%> (-7.15%) ⬇️
aiohttp/http.py 100.00% <0.00%> (ø)
aiohttp/connector.py 94.62% <0.00%> (ø)
tests/test_streams.py 100.00% <0.00%> (ø)
tests/test_multipart.py 100.00% <0.00%> (ø)
... and 7 more

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

@Dreamsorcerer Dreamsorcerer merged commit b571bb9 into master Nov 29, 2022
@Dreamsorcerer Dreamsorcerer deleted the Dreamsorcerer-patch-4 branch November 29, 2022 18:45
@patchback
Copy link
Contributor

patchback bot commented Nov 29, 2022

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

❌ Failed to cleanly apply b571bb9 on top of patchback/backports/3.9/b571bb966a632b81ce0ea5751a3a0c56f219edcf/pr-6876

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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