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

Fix type ignore in SSLContext creation connector test #8676

Merged
merged 3 commits into from
Aug 10, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Aug 10, 2024

Fixes the typing in test_ssl_context_creation_raises. This is not a runtime change.

#8672 (comment)

@bdraco bdraco added bot:chronographer:skip This PR does not need to include a change note backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Aug 10, 2024
@bdraco bdraco changed the title Remove type ignore in SSLContext creation connector test Fix type ignore in SSLContext creation connector test Aug 10, 2024
@Dreamsorcerer
Copy link
Member

Dreamsorcerer commented Aug 10, 2024

With a little tweak to the pytest parametrize API that could probably be caught as a type error in the function signature/decorator... 🤔️

@bdraco bdraco marked this pull request as ready for review August 10, 2024 15:57
@bdraco bdraco requested a review from asvetlov as a code owner August 10, 2024 15:57
@bdraco bdraco enabled auto-merge (squash) August 10, 2024 16:00
Copy link

codecov bot commented Aug 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.98%. Comparing base (c3219bf) to head (424fc07).

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #8676   +/-   ##
=======================================
  Coverage   97.98%   97.98%           
=======================================
  Files         107      107           
  Lines       33825    33825           
  Branches     3969     3969           
=======================================
  Hits        33143    33143           
  Misses        505      505           
  Partials      177      177           
Flag Coverage Δ
CI-GHA 97.88% <100.00%> (ø)
OS-Linux 97.54% <100.00%> (+<0.01%) ⬆️
OS-Windows 95.92% <100.00%> (ø)
OS-macOS 97.21% <100.00%> (ø)
Py-3.10.11 97.35% <100.00%> (ø)
Py-3.10.14 97.28% <100.00%> (ø)
Py-3.11.9 97.51% <100.00%> (ø)
Py-3.12.4 97.63% <100.00%> (+0.10%) ⬆️
Py-3.8.10 95.56% <100.00%> (ø)
Py-3.8.18 97.07% <100.00%> (?)
Py-3.9.13 97.22% <100.00%> (ø)
Py-3.9.19 97.16% <100.00%> (+0.18%) ⬆️
Py-pypy7.3.16 96.75% <100.00%> (ø)
VM-macos 97.21% <100.00%> (ø)
VM-ubuntu 97.54% <100.00%> (+<0.01%) ⬆️
VM-windows 95.92% <100.00%> (ø)

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bdraco bdraco merged commit 2915102 into master Aug 10, 2024
38 of 40 checks passed
@bdraco bdraco deleted the remove_type_ignore branch August 10, 2024 16:10
Copy link
Contributor

patchback bot commented Aug 10, 2024

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

❌ Failed to cleanly apply 2915102 on top of patchback/backports/3.10/29151021f957a524f612e9effc20ede8538195ab/pr-8676

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

Copy link
Contributor

patchback bot commented Aug 10, 2024

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

❌ Failed to cleanly apply 2915102 on top of patchback/backports/3.11/29151021f957a524f612e9effc20ede8538195ab/pr-8676

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

bdraco added a commit that referenced this pull request Aug 10, 2024
bdraco added a commit that referenced this pull request Aug 10, 2024
bdraco added a commit that referenced this pull request Aug 10, 2024
bdraco added a commit that referenced this pull request Aug 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants