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

Remove Signal from __all__, replace aiohttp.Signal with aiosignal.Signal in docs #6201

Merged
merged 5 commits into from Nov 1, 2021

Conversation

asvetlov
Copy link
Member

@asvetlov asvetlov commented Nov 1, 2021

Fixes #6197

@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 backport-3.9 Trigger automatic backporting to the 3.9 release branch by Patchback robot labels Nov 1, 2021
@codecov
Copy link

codecov bot commented Nov 1, 2021

Codecov Report

Merging #6201 (02f143d) into master (3cea180) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #6201   +/-   ##
=======================================
  Coverage   93.29%   93.29%           
=======================================
  Files         102      103    +1     
  Lines       30351    30360    +9     
  Branches     2729     2729           
=======================================
+ Hits        28315    28324    +9     
  Misses       1858     1858           
  Partials      178      178           
Flag Coverage Δ
unit 93.22% <100.00%> (+<0.01%) ⬆️

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

Impacted Files Coverage Δ
aiohttp/__init__.py 100.00% <ø> (ø)
tests/test___all__.py 100.00% <100.00%> (ø)

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 3cea180...02f143d. Read the comment docs.

@Dreamsorcerer
Copy link
Member

Think we could just add a test file with from aiohttp import * as a regression test?

@asvetlov
Copy link
Member Author

asvetlov commented Nov 1, 2021

Think we could just add a test file with from aiohttp import * as a regression test?

Good idea.

@asvetlov asvetlov merged commit 7f0cd0d into master Nov 1, 2021
@asvetlov asvetlov deleted the remove-signal branch November 1, 2021 21:49
@patchback
Copy link
Contributor

patchback bot commented Nov 1, 2021

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

❌ Failed to cleanly apply 7f0cd0d on top of patchback/backports/3.8/7f0cd0d3bfbd3566b3035f670c8f351836c1ba08/pr-6201

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

Backporting merged PR #6201 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/7f0cd0d3bfbd3566b3035f670c8f351836c1ba08/pr-6201 upstream/3.9
  4. Now, cherry-pick PR Remove Signal from __all__, replace aiohttp.Signal with aiosignal.Signal in docs #6201 contents into that branch:
    $ git cherry-pick -x 7f0cd0d3bfbd3566b3035f670c8f351836c1ba08
    If it'll yell at you with something like fatal: Commit 7f0cd0d3bfbd3566b3035f670c8f351836c1ba08 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 7f0cd0d3bfbd3566b3035f670c8f351836c1ba08
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Remove Signal from __all__, replace aiohttp.Signal with aiosignal.Signal in docs #6201 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.9/7f0cd0d3bfbd3566b3035f670c8f351836c1ba08/pr-6201
  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 added a commit that referenced this pull request Nov 1, 2021
asvetlov added a commit that referenced this pull request Nov 1, 2021
@asvetlov
Copy link
Member Author

asvetlov commented Nov 1, 2021

Backported by 3c58fc3 and 778b334

@webknjaz
Copy link
Member

webknjaz commented Nov 1, 2021

Think we could just add a test file with from aiohttp import * as a regression test?

Could go even further and check whether there's no circular imports along the way. For example, see https://github.com/sanitizers/octomachinery/blob/be18b54/tests/circular_imports_test.py (this approach is picked up from pytest).

@asvetlov
Copy link
Member Author

asvetlov commented Nov 2, 2021

A champion is needed.
I have no capacity for this.

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.

AttributeError: module 'aiohttp' has no attribute 'Signal'
3 participants