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

Switch to ThreadedChildWatcher and test (#5877) #5919

Conversation

sweatybridge
Copy link
Contributor

@sweatybridge sweatybridge commented Jul 28, 2021

Co-authored-by: Sviatoslav Sydorenko [email protected]
(cherry picked from commit 33a38b8)

What do these changes do?

Are there changes in behavior for the user?

Related issue number

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES folder
    • name it <issue_id>.<type> for example (588.bugfix)
    • if you don't have an issue_id change it to the pr id after creating the pr
    • ensure type is one of the following:
      • .feature: Signifying a new feature.
      • .bugfix: Signifying a bug fix.
      • .doc: Signifying a documentation improvement.
      • .removal: Signifying a deprecation or removal of public API.
      • .misc: A ticket has been closed, but it is not of interest to users.
    • Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

Co-authored-by: Sviatoslav Sydorenko <[email protected]>
(cherry picked from commit 33a38b8)
@sweatybridge sweatybridge requested a review from asvetlov as a code owner July 28, 2021 12:59
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Jul 28, 2021
@codecov
Copy link

codecov bot commented Jul 29, 2021

Codecov Report

Merging #5919 (33a38b8) into 3.8 (66e281f) will decrease coverage by 0.77%.
The diff coverage is 96.31%.

❗ Current head 33a38b8 differs from pull request most recent head 46963bf. Consider uploading reports for the commit 46963bf to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##              3.8    #5919      +/-   ##
==========================================
- Coverage   97.52%   96.75%   -0.78%     
==========================================
  Files          44       44              
  Lines        8865     9852     +987     
  Branches     1429     1591     +162     
==========================================
+ Hits         8646     9532     +886     
- Misses        103      182      +79     
- Partials      116      138      +22     
Flag Coverage Δ
unit 96.65% <96.08%> (-0.70%) ⬇️

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

Impacted Files Coverage Δ
aiohttp/web_middlewares.py 100.00% <ø> (ø)
aiohttp/web_protocol.py 86.41% <ø> (-4.20%) ⬇️
aiohttp/web_request.py 95.99% <ø> (-1.57%) ⬇️
aiohttp/web_response.py 98.21% <ø> (-0.06%) ⬇️
aiohttp/web_routedef.py 98.11% <ø> (+0.01%) ⬆️
aiohttp/web_runner.py 97.74% <ø> (+0.11%) ⬆️
aiohttp/web_server.py 94.28% <ø> (-5.72%) ⬇️
aiohttp/web_urldispatcher.py 97.83% <ø> (+0.23%) ⬆️
aiohttp/web_ws.py 91.53% <ø> (ø)
aiohttp/worker.py 94.91% <ø> (-1.81%) ⬇️
... and 77 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 27dfe44...46963bf. Read the comment docs.

@asvetlov
Copy link
Member

Something is wrong with tests (Py 3.10 MacOS)
Sorry, I have no capacity to fix it.
Help is needed. @sweatybridge would you finish the PR?

@sweatybridge
Copy link
Contributor Author

Sure, I will take a look tmr.

@asvetlov
Copy link
Member

Awesome, thanks!

@asvetlov asvetlov merged commit 7d046b5 into aio-libs:3.8 Oct 28, 2021
@patchback
Copy link
Contributor

patchback bot commented Oct 28, 2021

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

❌ Failed to cleanly apply 7d046b5 on top of patchback/backports/3.8/7d046b5cffb219ee1771d9bc8ae4d2d3f50ff795/pr-5919

Backporting merged PR #5919 into 3.8

  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.8/7d046b5cffb219ee1771d9bc8ae4d2d3f50ff795/pr-5919 upstream/3.8
  4. Now, cherry-pick PR Switch to ThreadedChildWatcher and test (#5877) #5919 contents into that branch:
    $ git cherry-pick -x 7d046b5cffb219ee1771d9bc8ae4d2d3f50ff795
    If it'll yell at you with something like fatal: Commit 7d046b5cffb219ee1771d9bc8ae4d2d3f50ff795 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 7d046b5cffb219ee1771d9bc8ae4d2d3f50ff795
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Switch to ThreadedChildWatcher and test (#5877) #5919 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.8/7d046b5cffb219ee1771d9bc8ae4d2d3f50ff795/pr-5919
  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:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants