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

Bump async-timeout to >=4.0 #6193

Merged
merged 2 commits into from
Nov 1, 2021
Merged

Bump async-timeout to >=4.0 #6193

merged 2 commits into from
Nov 1, 2021

Conversation

asvetlov
Copy link
Member

@asvetlov asvetlov commented Nov 1, 2021

No description provided.

@asvetlov asvetlov requested a review from webknjaz as a code owner November 1, 2021 12:16
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Nov 1, 2021
@asvetlov asvetlov added backport-3.8 and removed bot:chronographer:provided There is a change note present in this PR labels Nov 1, 2021
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Nov 1, 2021
@asvetlov asvetlov enabled auto-merge (squash) November 1, 2021 12:17
@codecov
Copy link

codecov bot commented Nov 1, 2021

Codecov Report

Merging #6193 (f26d964) into master (15f4411) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #6193   +/-   ##
=======================================
  Coverage   93.29%   93.29%           
=======================================
  Files         102      102           
  Lines       30351    30351           
  Branches     2729     2729           
=======================================
  Hits        28315    28315           
  Misses       1858     1858           
  Partials      178      178           
Flag Coverage Δ
unit 93.21% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out 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 e800d79...f26d964. Read the comment docs.

@asvetlov asvetlov merged commit c408ca1 into master Nov 1, 2021
@asvetlov asvetlov deleted the bump-async-timeout branch November 1, 2021 12:57
@patchback
Copy link
Contributor

patchback bot commented Nov 1, 2021

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

❌ Failed to cleanly apply c408ca1 on top of patchback/backports/3.8/c408ca1a6f5245e9e90d703b82ef7e366dad46e9/pr-6193

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

patchback bot commented Nov 1, 2021

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

❌ Failed to cleanly apply c408ca1 on top of patchback/backports/3.9/c408ca1a6f5245e9e90d703b82ef7e366dad46e9/pr-6193

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

@gitpushdashf
Copy link

Would it be possible for this to support async-timeout 3.0 at the same time?

@asvetlov
Copy link
Member Author

asvetlov commented Nov 1, 2021

No, sorry

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