Skip to content

Remove overlapping slots and fix broken slots inheritance - #6547

Merged
asvetlov merged 9 commits into
aio-libs:masterfrom
ariebovenberg:fix-slots
Jan 25, 2022
Merged

Remove overlapping slots and fix broken slots inheritance#6547
asvetlov merged 9 commits into
aio-libs:masterfrom
ariebovenberg:fix-slots

install base requirements for slotscheck in CI

32ce395
Select commit
Loading
Failed to load commit list.
Patchback / Backport to 3.15 completed Aug 17, 2026 in 7s

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

❌ Failed to cleanly apply 65de218 on top of patchback/backports/3.15/65de218c6297284663eeae5c07e9146ef1e4485e/pr-6547

Details

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