Test typing round 2 by Dreamsorcerer · Pull Request #8620 · aio-libs/aiohttp

Dreamsorcerer · 2024-08-06T22:33:04Z

Another round of typing all the test files.

I'll check over the diff tomorrow.

for more information, see https://pre-commit.ci

github-advanced-security

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

for more information, see https://pre-commit.ci

aiohttp/client.py

+            method: str,
+            url: StrOrURL,
+            **kwargs: Unpack[_RequestOptions],
+        ) -> "_RequestContextManager": ...


aiohttp/pytest_plugin.py

+        *,
+        server_kwargs: Optional[Dict[str, Any]] = None,
+        **kwargs: Any
+    ) -> Awaitable[TestClient]: ...


aiohttp/pytest_plugin.py

+class AiohttpServer(Protocol):
+    def __call__(
+        self, app: Application, *, port: Optional[int] = None, **kwargs: Any
+    ) -> Awaitable[TestServer]: ...


aiohttp/test_utils.py

+
+        def request(
+            self, method: str, path: StrOrURL, **kwargs: Unpack[_RequestOptions]
+        ) -> _RequestContextManager: ...


aiohttp/test_utils.py

+            self,
+            path: StrOrURL,
+            **kwargs: Unpack[_RequestOptions],
+        ) -> _RequestContextManager: ...


tests/test_client_request.py

    resp = await req.send(conn)
+    assert req._writer is not None
    await req._writer
+    await t


tests/test_client_request.py


+    assert req._writer is not None
    await req._writer
+    await t


tests/test_client_session.py

+                # normally called during garbage collection.  triggers an exception
+                # if the connection wasn't already closed
+                for c in connections:
+                    c.__del__()


tests/test_client_session.py

    with pytest.raises(TypeError):

-        class A(ClientSession):
+        class A(ClientSession):  # type: ignore[misc]


tests/test_cookiejar.py

…typing2

codecov · 2024-08-07T10:56:10Z

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.

aiohttp/typedefs.py

patchback · 2024-08-07T15:20:14Z

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

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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

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
```
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.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.11/e0ff5246e1d29b7710ab1a2bbc972b48169f1c05/pr-8620

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.

(cherry picked from commit c7293e1)

…various type annotations (#8635) **This is a backport of PR #8634 as merged into 3.11 (c7293e1).** Co-authored-by: Sam Bull <[email protected]>

Test typing round 2

84e0290

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 requested a review from asvetlov as a code owner August 6, 2024 22:33

[pre-commit.ci] auto fixes from pre-commit.com hooks

0bd5e60

for more information, see https://pre-commit.ci

github-advanced-security bot found potential problems Aug 6, 2024

View reviewed changes

Update lint.in

f8e6b82

Dreamsorcerer requested a review from webknjaz as a code owner August 6, 2024 22:51

Dreamsorcerer and others added 16 commits August 6, 2024 23:53

Update lint.txt

e19fabf

Update ci-cd.yml

4aa630f

Update test_cookiejar.py

f4c97a7

Update test_client_session.py

a523d50

[pre-commit.ci] auto fixes from pre-commit.com hooks

4c10987

for more information, see https://pre-commit.ci

Update test_cookiejar.py

963a233

Update test_client_response.py

3e283b4

Update test_client_functional.py

537aea9

Update test_client_request.py

5d894c3

Fix

b1a94f4

Update client.py

3fd242a

Update cookiejar.py

3ea994d

Update test_client_request.py

e5dd252

Update test_client_session.py

53f0ad1

Update test_client_ws.py

866ad69

[pre-commit.ci] auto fixes from pre-commit.com hooks

26b1e60

for more information, see https://pre-commit.ci

github-advanced-security bot found potential problems Aug 7, 2024

View reviewed changes

Dreamsorcerer added 4 commits August 7, 2024 01:12

Update test_connector.py

f0099f0

Update test_cookiejar.py

735e25f

Replace sentinel with empty str

5cb084e

Merge branch 'test-typing2' of github.com:aio-libs/aiohttp into test-…

19347af

…typing2

Update .coveragerc

5801545

bdraco reviewed Aug 7, 2024

View reviewed changes

aiohttp/typedefs.py Show resolved Hide resolved

bdraco approved these changes Aug 7, 2024

View reviewed changes

Dreamsorcerer added 17 commits August 7, 2024 13:08

Coverage improvements

94c6a71

Update .coveragerc

ca6e838

Coverage

bb1d5b8

Coverage

3e4a2ca

Update test_client_session.py

cb476ec

Update test_client_ws_functional.py

7d95da1

Coverage

4e30fbc

Update test_client_functional.py

0ed2b77

Update test_client_response.py

26a6318

Update test_client_functional.py

668dd75

Update test_client_request.py

5082ceb

Merge branch 'master' into test-typing2

fd9ba47

Merge branch 'master' into test-typing2

cdf3161

Update test_client_request.py

86d68fb

Update test_connector.py

4ce72fa

Update test_connector.py

612be40

Update test_connector.py

b5bda48

Dreamsorcerer merged commit e0ff524 into master Aug 7, 2024

Dreamsorcerer deleted the test-typing2 branch August 7, 2024 15:19

Dreamsorcerer added backport-3.11 and removed backport:skip Skip backport bot labels Aug 7, 2024

Dreamsorcerer added a commit that referenced this pull request Aug 7, 2024

Backport #8620

e3d7f87

Dreamsorcerer added a commit that referenced this pull request Aug 7, 2024

Backport #8620 as improvements to various type annotations (#8634)

c7293e1

patchback bot pushed a commit that referenced this pull request Aug 7, 2024

Backport #8620 as improvements to various type annotations (#8634)

0b88abf

(cherry picked from commit c7293e1)

layday mentioned this pull request Oct 3, 2024

trace_request_ctx type is too restrictive #9397

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Test typing round 2#8620

Test typing round 2#8620
Dreamsorcerer merged 41 commits intomasterfrom
test-typing2

Dreamsorcerer commented Aug 6, 2024

Uh oh!

github-advanced-security bot left a comment

Uh oh!

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check warning

Check notice

Uh oh!

codecov bot commented Aug 7, 2024 •

edited

Loading

Uh oh!

Uh oh!

patchback bot commented Aug 7, 2024 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

Dreamsorcerer commented Aug 6, 2024

Uh oh!

github-advanced-security bot left a comment

Choose a reason for hiding this comment

Uh oh!

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check warning

Check notice

Uh oh!

codecov bot commented Aug 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

patchback bot commented Aug 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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

Backporting merged PR #8620 into master

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Aug 7, 2024 •

edited

Loading

patchback bot commented Aug 7, 2024 •

edited

Loading