Skip to content

Remove remaining attrs#5960

Merged
Dreamsorcerer merged 4 commits intomasterfrom
attrs
Aug 21, 2021
Merged

Remove remaining attrs#5960
Dreamsorcerer merged 4 commits intomasterfrom
attrs

Conversation

@Dreamsorcerer
Copy link
Copy Markdown
Member

@Dreamsorcerer Dreamsorcerer commented Aug 21, 2021

Fixes #5806

Done without looking at #5811 diff, so all code is my own.

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Aug 21, 2021
@codecov
Copy link
Copy Markdown

codecov bot commented Aug 21, 2021

Codecov Report

Merging #5960 (144e96b) into master (068e681) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #5960   +/-   ##
=======================================
  Coverage   96.75%   96.75%           
=======================================
  Files          44       44           
  Lines        9852     9852           
  Branches     1591     1591           
=======================================
  Hits         9532     9532           
  Misses        182      182           
  Partials      138      138           
Flag Coverage Δ
unit 96.65% <100.00%> (ø)

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

Impacted Files Coverage Δ
aiohttp/client.py 94.00% <ø> (ø)
aiohttp/web_protocol.py 86.41% <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 068e681...144e96b. Read the comment docs.

@Dreamsorcerer Dreamsorcerer merged commit d706554 into master Aug 21, 2021
@Dreamsorcerer Dreamsorcerer deleted the attrs branch August 21, 2021 12:50
@patchback
Copy link
Copy Markdown
Contributor

patchback bot commented Aug 21, 2021

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

❌ Failed to cleanly apply d706554 on top of patchback/backports/3.8/d70655445e0ceaa90c548ecc826b6873335f622e/pr-5960

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

[TODO] Finish wiping the attrs usage

1 participant