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

Test typing round 2 #8620

Merged
merged 41 commits into from
Aug 7, 2024
Merged

Test typing round 2 #8620

merged 41 commits into from
Aug 7, 2024

Conversation

Dreamsorcerer
Copy link
Member

Another round of typing all the test files.

I'll check over the diff tomorrow.

@Dreamsorcerer Dreamsorcerer added bot:chronographer:skip This PR does not need to include a change note backport:skip Skip backport bot labels Aug 6, 2024
@Dreamsorcerer Dreamsorcerer requested a review from asvetlov as a code owner August 6, 2024 22:33
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

@Dreamsorcerer Dreamsorcerer requested a review from webknjaz as a code owner August 6, 2024 22:51
aiohttp/client.py Dismissed Show dismissed Hide dismissed
aiohttp/pytest_plugin.py Dismissed Show dismissed Hide dismissed
aiohttp/pytest_plugin.py Dismissed Show dismissed Hide dismissed
aiohttp/test_utils.py Dismissed Show dismissed Hide dismissed
aiohttp/test_utils.py Dismissed Show dismissed Hide dismissed
tests/test_client_request.py Dismissed Show dismissed Hide dismissed
tests/test_client_request.py Dismissed Show dismissed Hide dismissed
tests/test_client_session.py Dismissed Show dismissed Hide dismissed
tests/test_client_session.py Dismissed Show dismissed Hide dismissed
tests/test_cookiejar.py Fixed Show fixed Hide fixed
Copy link

codecov bot commented Aug 7, 2024

Codecov Report

Attention: Patch coverage is 99.74916% with 3 lines in your changes missing coverage. Please review.

Project coverage is 97.90%. Comparing base (c99a1e2) to head (b5bda48).
Report is 851 commits behind head on master.

Files with missing lines Patch % Lines
aiohttp/test_utils.py 91.30% 1 Missing and 1 partial ⚠️
tests/test_client_exceptions.py 91.66% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8620      +/-   ##
==========================================
+ Coverage   97.66%   97.90%   +0.24%     
==========================================
  Files         107      107              
  Lines       33451    33471      +20     
  Branches     3928     3938      +10     
==========================================
+ Hits        32669    32769     +100     
+ Misses        566      518      -48     
+ Partials      216      184      -32     
Flag Coverage Δ
CI-GHA 97.81% <99.74%> (+0.24%) ⬆️
OS-Linux 97.47% <99.74%> (+0.24%) ⬆️
OS-Windows 95.85% <99.74%> (+0.23%) ⬆️
OS-macOS 97.15% <99.74%> (+0.24%) ⬆️
Py-3.10.11 97.29% <99.58%> (+0.25%) ⬆️
Py-3.10.14 97.23% <99.58%> (+0.24%) ⬆️
Py-3.11.9 97.45% <99.41%> (+0.24%) ⬆️
Py-3.12.4 97.58% <99.58%> (+0.24%) ⬆️
Py-3.8.10 95.61% <99.66%> (+0.24%) ⬆️
Py-3.8.18 97.12% <99.66%> (+0.25%) ⬆️
Py-3.9.13 97.28% <99.74%> (+0.24%) ⬆️
Py-3.9.19 97.26% <99.74%> (+0.28%) ⬆️
Py-pypy7.3.16 96.81% <99.66%> (+0.24%) ⬆️
VM-macos 97.15% <99.74%> (+0.24%) ⬆️
VM-ubuntu 97.47% <99.74%> (+0.24%) ⬆️
VM-windows 95.85% <99.74%> (+0.23%) ⬆️

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.

@Dreamsorcerer Dreamsorcerer merged commit e0ff524 into master Aug 7, 2024
36 of 37 checks passed
@Dreamsorcerer Dreamsorcerer deleted the test-typing2 branch August 7, 2024 15:19
@Dreamsorcerer Dreamsorcerer added backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot and removed backport:skip Skip backport bot labels Aug 7, 2024
Copy link
Contributor

patchback bot commented Aug 7, 2024

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

❌ Failed to cleanly apply e0ff524 on top of patchback/backports/3.11/e0ff5246e1d29b7710ab1a2bbc972b48169f1c05/pr-8620

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

Dreamsorcerer added a commit that referenced this pull request Aug 7, 2024
patchback bot pushed a commit that referenced this pull request Aug 7, 2024
Dreamsorcerer added a commit that referenced this pull request Aug 7, 2024
…various type annotations (#8635)

**This is a backport of PR #8634 as merged into 3.11
(c7293e1).**

Co-authored-by: Sam Bull <git@sambull.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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