Bump aiohttp from 3.10.10 to 3.11.2 (#464)

* Bump aiohttp from 3.10.10 to 3.11.2

Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.10.10 to 3.11.2.
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](aio-libs/aiohttp@v3.10.10...v3.11.2)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fix

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Svetlov <[email protected]>

Author: dependabot[bot]

requirements/prod.txt

@@ -1,2 +1,2 @@
-aiohttp==3.10.10
+aiohttp==3.11.2
 flit==3.10.1

tests/test_allowed_hosts.py

@@ -1,13 +1,9 @@
-from typing import Awaitable, Callable
-
 from aiohttp import web
-from aiohttp.test_utils import TestClient
+from aiohttp.pytest_plugin import AiohttpClient
 from aiohttp_remotes import AllowedHosts, setup as _setup
 
-_Client = Callable[[web.Application], Awaitable[TestClient]]
-
 
-async def test_allowed_hosts_ok(aiohttp_client: _Client) -> None:
+async def test_allowed_hosts_ok(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 
@@ -19,7 +15,7 @@ async def handler(request: web.Request) -> web.Response:
     assert resp.status == 200
 
 
-async def test_allowed_hosts_forbidden(aiohttp_client: _Client) -> None:
+async def test_allowed_hosts_forbidden(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 
@@ -31,7 +27,7 @@ async def handler(request: web.Request) -> web.Response:
     assert resp.status == 400
 
 
-async def test_allowed_hosts_star(aiohttp_client: _Client) -> None:
+async def test_allowed_hosts_star(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 
@@ -43,7 +39,7 @@ async def handler(request: web.Request) -> web.Response:
     assert resp.status == 200
 
 
-async def test_allowed_hosts_default(aiohttp_client: _Client) -> None:
+async def test_allowed_hosts_default(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 

tests/test_basic_auth.py

@@ -1,14 +1,10 @@
-from typing import Awaitable, Callable
-
 import aiohttp
 from aiohttp import web
-from aiohttp.test_utils import TestClient
+from aiohttp.pytest_plugin import AiohttpClient
 from aiohttp_remotes import BasicAuth, setup as _setup
 
-_Client = Callable[[web.Application], Awaitable[TestClient]]
-
 
-async def test_basic_auth_ok(aiohttp_client: _Client) -> None:
+async def test_basic_auth_ok(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 
@@ -20,7 +16,7 @@ async def handler(request: web.Request) -> web.Response:
     assert resp.status == 200
 
 
-async def test_basic_auth_request_auth(aiohttp_client: _Client) -> None:
+async def test_basic_auth_request_auth(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 
@@ -33,7 +29,7 @@ async def handler(request: web.Request) -> web.Response:
     assert resp.headers["WWW-Authenticate"] == "Basic realm=realm"
 
 
-async def test_basic_auth_wrong_creds(aiohttp_client: _Client) -> None:
+async def test_basic_auth_wrong_creds(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 
@@ -46,7 +42,7 @@ async def handler(request: web.Request) -> web.Response:
     assert resp.headers["WWW-Authenticate"] == "Basic realm=realm"
 
 
-async def test_basic_auth_malformed_req(aiohttp_client: _Client) -> None:
+async def test_basic_auth_malformed_req(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 
@@ -59,7 +55,7 @@ async def handler(request: web.Request) -> web.Response:
     assert resp.headers["WWW-Authenticate"] == "Basic realm=realm"
 
 
-async def test_basic_auth_malformed_req2(aiohttp_client: _Client) -> None:
+async def test_basic_auth_malformed_req2(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 
@@ -72,7 +68,7 @@ async def handler(request: web.Request) -> web.Response:
     assert resp.headers["WWW-Authenticate"] == "Basic realm=realm"
 
 
-async def test_basic_auth_white_path(aiohttp_client: _Client) -> None:
+async def test_basic_auth_white_path(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 

tests/test_cloudfare.py

@@ -18,11 +18,11 @@
 import aiohttp
 from aiohttp import web
 from aiohttp.abc import AbstractResolver
+from aiohttp.pytest_plugin import AiohttpClient
 from aiohttp.resolver import DefaultResolver
-from aiohttp.test_utils import TestClient, unused_port
+from aiohttp.test_utils import unused_port
 from aiohttp_remotes import Cloudflare, setup as _setup
 
-_Client = Callable[[web.Application], Awaitable[TestClient]]
 _CloudSession = Callable[..., Awaitable[aiohttp.ClientSession]]
 
 
@@ -125,7 +125,7 @@ async def go(**kwargs: Any) -> aiohttp.ClientSession:
 
 
 async def test_cloudfare_ok(
-    aiohttp_client: _Client, cloudfare_session: _CloudSession
+    aiohttp_client: AiohttpClient, cloudfare_session: _CloudSession
 ) -> None:
     async def handler(request: web.Request) -> web.Response:
         assert request.remote == "10.10.10.10"
@@ -143,7 +143,7 @@ async def handler(request: web.Request) -> web.Response:
 
 
 async def test_cloudfare_no_networks(
-    aiohttp_client: _Client, cloudfare_session: _CloudSession
+    aiohttp_client: AiohttpClient, cloudfare_session: _CloudSession
 ) -> None:
     cf_client = await cloudfare_session(ipv4=[], ipv6=[])
 
@@ -153,7 +153,7 @@ async def test_cloudfare_no_networks(
 
 
 async def test_cloudfare_not_cloudfare(
-    aiohttp_client: _Client, cloudfare_session: _CloudSession
+    aiohttp_client: AiohttpClient, cloudfare_session: _CloudSession
 ) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
@@ -169,7 +169,7 @@ async def handler(request: web.Request) -> web.Response:
 
 
 async def test_cloudfare_garbage_config(
-    aiohttp_client: _Client, cloudfare_session: _CloudSession
+    aiohttp_client: AiohttpClient, cloudfare_session: _CloudSession
 ) -> None:
     async def handler(request: web.Request) -> web.Response:
         assert request.remote == "10.10.10.10"

tests/test_forwarded.py

@@ -1,13 +1,9 @@
-from typing import Awaitable, Callable
-
 from aiohttp import web
-from aiohttp.test_utils import TestClient
+from aiohttp.pytest_plugin import AiohttpClient
 from aiohttp_remotes import ForwardedRelaxed, ForwardedStrict, setup as _setup
 
-_Client = Callable[[web.Application], Awaitable[TestClient]]
-
 
-async def test_forwarded_relaxed_ok(aiohttp_client: _Client) -> None:
+async def test_forwarded_relaxed_ok(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         assert request.host == "example.com"
         assert request.scheme == "https"
@@ -25,7 +21,7 @@ async def handler(request: web.Request) -> web.Response:
         assert resp.status == 200
 
 
-async def test_forwarded_relaxed_no_for(aiohttp_client: _Client) -> None:
+async def test_forwarded_relaxed_no_for(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         assert request.host == "example.com"
         assert request.scheme == "https"
@@ -43,7 +39,7 @@ async def handler(request: web.Request) -> web.Response:
         assert resp.status == 200
 
 
-async def test_forwarded_relaxed_no_proto(aiohttp_client: _Client) -> None:
+async def test_forwarded_relaxed_no_proto(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         assert request.host == "example.com"
         assert request.scheme == "http"
@@ -61,7 +57,7 @@ async def handler(request: web.Request) -> web.Response:
     assert resp.status == 200
 
 
-async def test_forwarded_relaxed_no_host(aiohttp_client: _Client) -> None:
+async def test_forwarded_relaxed_no_host(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         url = cl.make_url("/")
         assert url.host is not None
@@ -82,7 +78,7 @@ async def handler(request: web.Request) -> web.Response:
         assert resp.status == 200
 
 
-async def test_forwarded_relaxed_many_hosts(aiohttp_client: _Client) -> None:
+async def test_forwarded_relaxed_many_hosts(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         assert request.host == "example.com"
         assert request.scheme == "https"
@@ -102,7 +98,7 @@ async def handler(request: web.Request) -> web.Response:
         assert resp.status == 200
 
 
-async def test_forwarded_strict_ok(aiohttp_client: _Client) -> None:
+async def test_forwarded_strict_ok(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         assert request.host == "example.com"
         assert request.scheme == "https"
@@ -120,7 +116,7 @@ async def handler(request: web.Request) -> web.Response:
         assert resp.status == 200
 
 
-async def test_forwarded_strict_no_proto(aiohttp_client: _Client) -> None:
+async def test_forwarded_strict_no_proto(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         assert request.host == "example.com"
         assert request.scheme == "http"
@@ -137,7 +133,7 @@ async def handler(request: web.Request) -> web.Response:
         assert resp.status == 200
 
 
-async def test_forwarded_strict_no_host(aiohttp_client: _Client) -> None:
+async def test_forwarded_strict_no_host(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         assert request.host.startswith("127.0.0.1:")
         assert request.scheme == "https"
@@ -154,7 +150,7 @@ async def handler(request: web.Request) -> web.Response:
         assert resp.status == 200
 
 
-async def test_forwarded_strict_too_many_protos(aiohttp_client: _Client) -> None:
+async def test_forwarded_strict_too_many_protos(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 
@@ -169,7 +165,7 @@ async def handler(request: web.Request) -> web.Response:
         assert resp.status == 400
 
 
-async def test_forwarded_strict_too_many_for(aiohttp_client: _Client) -> None:
+async def test_forwarded_strict_too_many_for(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 
@@ -181,7 +177,7 @@ async def handler(request: web.Request) -> web.Response:
     assert resp.status == 400
 
 
-async def test_forwarded_strict_untrusted_ip(aiohttp_client: _Client) -> None:
+async def test_forwarded_strict_untrusted_ip(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 
@@ -193,7 +189,7 @@ async def handler(request: web.Request) -> web.Response:
         assert resp.status == 400
 
 
-async def test_forwarded_strict_whitelist(aiohttp_client: _Client) -> None:
+async def test_forwarded_strict_whitelist(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         assert request.remote == "127.0.0.1"
         return web.Response()
@@ -206,7 +202,7 @@ async def handler(request: web.Request) -> web.Response:
         assert resp.status == 200
 
 
-async def test_forwarded_strict_no_for(aiohttp_client: _Client) -> None:
+async def test_forwarded_strict_no_for(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 

tests/test_secure.py

@@ -1,21 +1,18 @@
 import ssl
-from typing import Awaitable, Callable
 
 import pytest
 from yarl import URL
 
 import aiohttp
 from aiohttp import web
-from aiohttp.test_utils import TestClient, TestServer, make_mocked_request
+from aiohttp.pytest_plugin import AiohttpClient, AiohttpServer
+from aiohttp.test_utils import make_mocked_request
 from aiohttp_remotes import Secure, setup as _setup
 
-_Server = Callable[..., Awaitable[TestServer]]
-_Client = Callable[..., Awaitable[TestClient]]
-
 
 async def test_secure_ok(
-    aiohttp_client: _Client,
-    aiohttp_server: _Server,
+    aiohttp_client: AiohttpClient,
+    aiohttp_server: AiohttpServer,
     ssl_ctx: ssl.SSLContext,
     client_ssl_ctx: ssl.SSLContext,
 ) -> None:
@@ -39,8 +36,8 @@ async def handler(request: web.Request) -> web.Response:
 
 
 async def test_secure_redirect(
-    aiohttp_client: _Client,
-    aiohttp_server: _Server,
+    aiohttp_client: AiohttpClient,
+    aiohttp_server: AiohttpServer,
     ssl_ctx: ssl.SSLContext,
     client_ssl_ctx: ssl.SSLContext,
 ) -> None:
@@ -62,7 +59,7 @@ async def handler(request: web.Request) -> web.Response:
         assert resp.request_info.url.scheme == "https"
 
 
-async def test_secure_no_redirection(aiohttp_client: _Client) -> None:
+async def test_secure_no_redirection(aiohttp_client: AiohttpClient) -> None:
     async def handler(request: web.Request) -> web.Response:
         return web.Response()
 
@@ -76,8 +73,8 @@ async def handler(request: web.Request) -> web.Response:
 
 
 async def test_no_x_frame(
-    aiohttp_client: _Client,
-    aiohttp_server: _Server,
+    aiohttp_client: AiohttpClient,
+    aiohttp_server: AiohttpServer,
     ssl_ctx: ssl.SSLContext,
     client_ssl_ctx: ssl.SSLContext,
 ) -> None:
@@ -101,8 +98,8 @@ async def handler(request: web.Request) -> web.Response:
 
 
 async def test_no_sts(
-    aiohttp_client: _Client,
-    aiohttp_server: _Server,
+    aiohttp_client: AiohttpClient,
+    aiohttp_server: AiohttpServer,
     ssl_ctx: ssl.SSLContext,
     client_ssl_ctx: ssl.SSLContext,
 ) -> None:
@@ -125,8 +122,8 @@ async def handler(request: web.Request) -> web.Response:
 
 
 async def test_no_cto(
-    aiohttp_client: _Client,
-    aiohttp_server: _Server,
+    aiohttp_client: AiohttpClient,
+    aiohttp_server: AiohttpServer,
     ssl_ctx: ssl.SSLContext,
     client_ssl_ctx: ssl.SSLContext,
 ) -> None:
@@ -150,8 +147,8 @@ async def handler(request: web.Request) -> web.Response:
 
 
 async def test_no_xss(
-    aiohttp_client: _Client,
-    aiohttp_server: _Server,
+    aiohttp_client: AiohttpClient,
+    aiohttp_server: AiohttpServer,
     ssl_ctx: ssl.SSLContext,
     client_ssl_ctx: ssl.SSLContext,
 ) -> None: