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

Restored ability to connect IPv6-only host. #6309

Merged
merged 5 commits into from Nov 14, 2021
Merged

Restored ability to connect IPv6-only host. #6309

merged 5 commits into from Nov 14, 2021

Conversation

asvetlov
Copy link
Member

@asvetlov asvetlov commented Nov 14, 2021

Fixes #6195

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Nov 14, 2021
@asvetlov asvetlov added backport-3.8 backport-3.9 Trigger automatic backporting to the 3.9 release branch by Patchback robot labels Nov 14, 2021
@codecov
Copy link

codecov bot commented Nov 14, 2021

Codecov Report

Merging #6309 (da9c264) into master (7f32513) will increase coverage by 0.01%.
The diff coverage is 62.50%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6309      +/-   ##
==========================================
+ Coverage   93.30%   93.31%   +0.01%     
==========================================
  Files         103      103              
  Lines       30366    30369       +3     
  Branches     2730     2731       +1     
==========================================
+ Hits        28333    28340       +7     
+ Misses       1857     1852       -5     
- Partials      176      177       +1     
Flag Coverage Δ
unit 93.24% <62.50%> (+0.01%) ⬆️

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

Impacted Files Coverage Δ
aiohttp/resolver.py 64.00% <57.14%> (+2.29%) ⬆️
tests/test_resolver.py 70.07% <100.00%> (ø)
tests/test_connector.py 95.70% <0.00%> (+0.26%) ⬆️

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 7f32513...da9c264. Read the comment docs.

@asvetlov asvetlov merged commit a370cf4 into master Nov 14, 2021
@asvetlov asvetlov deleted the connect-ipv6 branch November 14, 2021 12:37
@patchback
Copy link
Contributor

patchback bot commented Nov 14, 2021

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

❌ Failed to cleanly apply a370cf4 on top of patchback/backports/3.8/a370cf4acdb0d30cc2099d1c9e4a70db9c126c9f/pr-6309

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

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

❌ Failed to cleanly apply a370cf4 on top of patchback/backports/3.9/a370cf4acdb0d30cc2099d1c9e4a70db9c126c9f/pr-6309

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

@asvetlov
Copy link
Member Author

Backported by 8adddad and a6056fb

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.

Connecting to IPv6-only hosts fails with a RuntimeError
1 participant