Sync from aiohttp (#69)

Author: Dreamsorcerer

.github/dependabot.yml

@@ -0,0 +1,12 @@
+---
+version: 2
+updates:
+- package-ecosystem: pip
+  directory: /
+  schedule:
+    interval: daily
+
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: monthly

.github/workflows/auto-merge.yml

@@ -0,0 +1,23 @@
+---
+name: Dependabot auto-merge
+on: pull_request_target
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+    - name: Dependabot metadata
+      id: metadata
+      uses: dependabot/fetch-metadata@v2
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Enable auto-merge for Dependabot PRs
+      run: gh pr merge --auto --squash "$PR_URL"
+      env:
+        PR_URL: ${{github.event.pull_request.html_url}}
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/ci.yaml

@@ -2,20 +2,29 @@
 name: CI
 
 on:
+  merge_group:
   push:
     branches: [master]
     tags: [v*]
   pull_request:
-    branches: [master]
-  workflow_dispatch:
 
 jobs:
   lint:
     name: Run linters
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+      with:
+        python-version: 3.11
+        cache: pip
+        cache-dependency-path: '**/requirements*.txt'
+    - name: Install dependencies
+      uses: py-actions/py-dependency-install@v4
+      with:
+        path: requirements-dev.txt
+    - name: Run mypy
+      run: mypy
     - name: Install check-wheel-content, pre-commit, and twine
       run: python -m pip install build pre-commit check-wheel-contents twine
     - name: Build package
@@ -30,23 +39,42 @@ jobs:
   test:
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        pyver: ['3.9', '3.10', '3.11', '3.12', '3.13']
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Setup Python ${{ matrix.pyver }}
+      uses: actions/setup-python@v5
       with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install Python ${{ matrix.python-version }} dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install .
+        python-version: ${{ matrix.pyver }}
+        cache: pip
+        cache-dependency-path: '**/requirements*.txt'
+    - name: Install dependencies
+      uses: py-actions/py-dependency-install@v4
+      with:
+        path: requirements.txt
     - name: Run pytest
       run: pytest
 
 
+  check:  # This job does nothing and is only used for the branch protection
+    if: always()
+
+    needs:
+    - lint
+    - test
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Decide whether the needed jobs succeeded or failed
+      uses: re-actors/alls-green@release/v1
+      with:
+        jobs: ${{ toJSON(needs) }}
+
+
   deploy:
     name: Deploy
     environment: release

pytest_aiohttp/plugin.py

@@ -1,4 +1,4 @@
-from collections.abc import Awaitable, Iterator
+from collections.abc import AsyncIterator, Awaitable
 from typing import (
     Any,
     Dict,
@@ -20,8 +20,9 @@
 
 
 class AiohttpClient(Protocol):
+    # TODO(PY311): Use Unpack to specify ClientSession kwargs.
     @overload
-    async def __call__(
+    async def __call__(  # type: ignore[misc]
         self,
         __param: Application,
         *,
@@ -30,7 +31,7 @@ async def __call__(
     ) -> TestClient[Request, Application]: ...
 
     @overload
-    async def __call__(
+    async def __call__(  # type: ignore[misc]
         self,
         __param: BaseTestServer,  # TODO(aiohttp4): BaseTestServer[_Request]
         *,
@@ -64,7 +65,7 @@ def __call__(
 
 
 @pytest.hookimpl(tryfirst=True)
-def pytest_configure(config) -> None:
+def pytest_configure(config: pytest.Config) -> None:
     val = config.getoption("asyncio_mode")
     if val is None:
         val = config.getini("asyncio_mode")
@@ -74,7 +75,7 @@ def pytest_configure(config) -> None:
 
 
 @pytest_asyncio.fixture
-async def aiohttp_server() -> Iterator[AiohttpServer]:
+async def aiohttp_server() -> AsyncIterator[AiohttpServer]:
     """Factory to create a TestServer instance, given an app.
 
     aiohttp_server(app, **kwargs)
@@ -100,7 +101,7 @@ async def go(
 
 
 @pytest_asyncio.fixture
-async def aiohttp_raw_server() -> Iterator[AiohttpRawServer]:
+async def aiohttp_raw_server() -> AsyncIterator[AiohttpRawServer]:
     """Factory to create a RawTestServer instance, given a web handler.
 
     aiohttp_raw_server(handler, **kwargs)
@@ -124,8 +125,8 @@ async def go(
         await servers.pop().close()
 
 
-@pytest_asyncio.fixture
-def aiohttp_client_cls() -> Type[TestClient[Any, Any]]:
+@pytest.fixture
+def aiohttp_client_cls() -> Type[TestClient[Any, Any]]:  # type: ignore[misc]
     """
     Client class to use in ``aiohttp_client`` factory.
 
@@ -152,9 +153,9 @@ def test_login(aiohttp_client):
 
 
 @pytest_asyncio.fixture
-async def aiohttp_client(
+async def aiohttp_client(  # type: ignore[misc]
     aiohttp_client_cls: Type[TestClient[Any, Any]],
-) -> Iterator[AiohttpClient]:
+) -> AsyncIterator[AiohttpClient]:
     """Factory to create a TestClient instance.
 
     aiohttp_client(app, **kwargs)
@@ -164,15 +165,15 @@ async def aiohttp_client(
     clients = []
 
     @overload
-    async def go(
+    async def go(  # type: ignore[misc]
         __param: Application,
         *,
         server_kwargs: Optional[Dict[str, Any]] = None,
         **kwargs: Any,
     ) -> TestClient[Request, Application]: ...
 
     @overload
-    async def go(
+    async def go(  # type: ignore[misc]
         __param: BaseTestServer,  # TODO(aiohttp4): BaseTestServer[_Request]
         *,
         server_kwargs: Optional[Dict[str, Any]] = None,
@@ -187,6 +188,7 @@ async def go(
         server_kwargs: Optional[Dict[str, Any]] = None,
         **kwargs: Any,
     ) -> TestClient[Any, Any]:
+        # TODO(PY311): Use Unpack to specify ClientSession kwargs and server_kwargs.
         if isinstance(__param, Application):
             server_kwargs = server_kwargs or {}
             server = TestServer(__param, **server_kwargs)

requirements-dev.txt

@@ -0,0 +1,3 @@
+-r requirements.txt
+
+mypy==1.15.0

requirements.txt

@@ -0,0 +1,4 @@
+-e .
+aiohttp==3.11.17
+pytest==8.3.5
+pytest-asyncio==0.26.0

setup.cfg

@@ -42,7 +42,7 @@ setup_requires =
 
 install_requires =
   pytest >= 6.1.0
-  aiohttp >= 3.11.0b0
+  aiohttp >= 3.11.0
   pytest-asyncio >= 0.17.2
 
 [options.extras_require]