diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1657d0444d4..eff47252de0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -70,3 +70,15 @@ updates: target-branch: "3.15" schedule: interval: "monthly" + + # Maintain dependencies for GitHub Actions aiohttp 3.14 backport + - package-ecosystem: "github-actions" + directory: "/" + cooldown: + default-days: 3 + labels: + - dependencies + target-branch: "3.14" + schedule: + interval: "daily" + open-pull-requests-limit: 10 diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index bc66ed702e8..d105368d71d 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -320,7 +320,6 @@ jobs: env: COLOR: yes AIOHTTP_NO_EXTENSIONS: ${{ matrix.no-extensions }} - PIP_USER: 1 run: >- pytest --junitxml=junit.xml -m 'not dev_mode and not autobahn' shell: bash @@ -336,7 +335,6 @@ jobs: env: COLOR: yes AIOHTTP_NO_EXTENSIONS: ${{ matrix.no-extensions }} - PIP_USER: 1 PYTHONDEVMODE: 1 run: pytest -m dev_mode --cov-append --cov-report=xml --numprocesses=0 shell: bash @@ -470,9 +468,7 @@ jobs: env: COLOR: yes AIOHTTP_NO_EXTENSIONS: ${{ matrix.no-extensions }} - PIP_USER: 1 run: >- - PATH="${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH}" pytest --junitxml=junit.xml --cov-report=xml --numprocesses=0 --timeout=0 -o faulthandler_timeout=0 -m autobahn shell: bash @@ -608,7 +604,6 @@ jobs: - name: Run tests with Cython tracing env: COLOR: yes - PIP_USER: 1 run: >- pytest tests/test_client_functional.py tests/test_http_parser.py tests/test_http_writer.py tests/test_web_functional.py tests/test_web_response.py tests/test_websocket_parser.py --cov-config=.coveragerc-cython.toml diff --git a/CHANGES/13717.contrib.rst b/CHANGES/13717.contrib.rst new file mode 100644 index 00000000000..2a21e528d23 --- /dev/null +++ b/CHANGES/13717.contrib.rst @@ -0,0 +1,3 @@ +Removed stale ``filterwarnings`` ignores from the pytest configuration +that are no longer triggered by aiohttp, the supported Python versions +or the pinned test dependencies -- by :user:`aiolibsbot`. diff --git a/CHANGES/13718.contrib.rst b/CHANGES/13718.contrib.rst new file mode 100644 index 00000000000..8613749e11f --- /dev/null +++ b/CHANGES/13718.contrib.rst @@ -0,0 +1,4 @@ +Dropped the leftover ``PIP_USER`` setting and the ``pip --user`` ``PATH`` +prefix from the CI workflow; both became dead once the test jobs started +provisioning Python via ``astral-sh/setup-uv`` +-- by :user:`aiolibsbot`. diff --git a/CHANGES/13721.contrib.rst b/CHANGES/13721.contrib.rst new file mode 120000 index 00000000000..994b0da4d0a --- /dev/null +++ b/CHANGES/13721.contrib.rst @@ -0,0 +1 @@ +13718.contrib.rst \ No newline at end of file diff --git a/CHANGES/13727.contrib.rst b/CHANGES/13727.contrib.rst new file mode 100644 index 00000000000..cb3368bf558 --- /dev/null +++ b/CHANGES/13727.contrib.rst @@ -0,0 +1,3 @@ +Configured Dependabot to also bump GitHub Actions on the ``3.14`` +branch, so its CI workflow pins no longer fall behind master +-- by :user:`aiolibsbot`. diff --git a/pytest.ini b/pytest.ini index 314d4636657..f8d220488fa 100644 --- a/pytest.ini +++ b/pytest.ini @@ -53,30 +53,7 @@ faulthandler_timeout = 30 filterwarnings = error - ignore:module 'ssl' has no attribute 'OP_NO_COMPRESSION'. The Python interpreter is compiled against OpenSSL < 1.0.0. Ref. https.//docs.python.org/3/library/ssl.html#ssl.OP_NO_COMPRESSION:UserWarning ignore:Unclosed client session 2022.06.15`. - ignore:path is deprecated. Use files.. instead. Refer to https.//importlib-resources.readthedocs.io/en/latest/using.html#migrating-from-legacy for migration advice.:DeprecationWarning:certifi.core - # Dateutil deprecation warning already fixed upstream. - # Can be dropped with the next release, `dateutil > 2.8.2` - # https://github.com/dateutil/dateutil/pull/1285 - ignore:datetime.*utcfromtimestamp\(\) is deprecated and scheduled for removal:DeprecationWarning:dateutil.tz.tz - # Tracked upstream and waiting for PR review - # https://github.com/spulec/freezegun/issues/508 - # https://github.com/spulec/freezegun/pull/511 - ignore:datetime.*utcnow\(\) is deprecated and scheduled for removal:DeprecationWarning:freezegun.api # coverage's C tracer is not available on iOS/Android (pure-Python fallback is used instead) ignore:Couldn't import C tracer:coverage.exceptions.CoverageWarning # Weird issue in Python 3.13+ triggered in test_multipart.py diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 32210cd9454..e4f9dfa73b2 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -26,7 +26,7 @@ alabaster==1.0.0 # via sphinx annotated-types==0.8.0 # via pydantic -ast-serialize==0.10.0 +ast-serialize==0.11.1 # via mypy async-timeout==5.0.1 ; python_version < "3.11" # via @@ -168,7 +168,7 @@ pip-tools==7.6.1 # via -r requirements/dev.in pkgconfig==1.6.0 # via -r requirements/test-common-base.in -platformdirs==4.11.7 +platformdirs==4.11.8 # via virtualenv pluggy==1.6.0 # via diff --git a/requirements/dev.txt b/requirements/dev.txt index 7ce427eae91..a679092b69f 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -26,7 +26,7 @@ alabaster==1.0.0 # via sphinx annotated-types==0.8.0 # via pydantic -ast-serialize==0.10.0 +ast-serialize==0.11.1 # via mypy async-timeout==5.0.1 ; python_version < "3.11" # via @@ -165,7 +165,7 @@ pip-tools==7.6.1 # via -r requirements/dev.in pkgconfig==1.6.0 # via -r requirements/test-common-base.in -platformdirs==4.11.7 +platformdirs==4.11.8 # via virtualenv pluggy==1.6.0 # via diff --git a/requirements/lint.txt b/requirements/lint.txt index 8e019e49a77..dc8106d210c 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -14,7 +14,7 @@ aiosignal==1.4.0 # via aiohttp annotated-types==0.8.0 # via pydantic -ast-serialize==0.10.0 +ast-serialize==0.11.1 # via mypy async-timeout==5.0.1 # via @@ -86,7 +86,7 @@ packaging==26.3 # via pytest pathspec==1.1.1 # via mypy -platformdirs==4.11.7 +platformdirs==4.11.8 # via virtualenv pluggy==1.6.0 # via pytest diff --git a/requirements/test-common.txt b/requirements/test-common.txt index 32f454b09db..cd4ff07f0ed 100644 --- a/requirements/test-common.txt +++ b/requirements/test-common.txt @@ -10,7 +10,7 @@ aiosignal==1.4.0 # via aiohttp annotated-types==0.8.0 # via pydantic -ast-serialize==0.10.0 +ast-serialize==0.11.1 # via mypy async-timeout==5.0.1 # via aiohttp diff --git a/requirements/test-ft.txt b/requirements/test-ft.txt index 6f0695e9ecd..952ef1f5b5f 100644 --- a/requirements/test-ft.txt +++ b/requirements/test-ft.txt @@ -18,7 +18,7 @@ aiosignal==1.4.0 # aiohttp annotated-types==0.8.0 # via pydantic -ast-serialize==0.10.0 +ast-serialize==0.11.1 # via mypy async-timeout==5.0.1 ; python_version < "3.11" # via diff --git a/requirements/test.txt b/requirements/test.txt index 9c6936dfa3a..ee8946bd05e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -18,7 +18,7 @@ aiosignal==1.4.0 # aiohttp annotated-types==0.8.0 # via pydantic -ast-serialize==0.10.0 +ast-serialize==0.11.1 # via mypy async-timeout==5.0.1 ; python_version < "3.11" # via diff --git a/tests/test_circular_imports.py b/tests/test_circular_imports.py index bb780fa84e6..a6d1d56e095 100644 --- a/tests/test_circular_imports.py +++ b/tests/test_circular_imports.py @@ -107,19 +107,6 @@ def test_no_warnings(import_path: str) -> None: # fmt: off sys.executable, "-W", "error", - # The following deprecation warning is triggered by importing - # `gunicorn.util`. Hopefully, it'll get fixed in the future. See - # https://github.com/benoitc/gunicorn/issues/2840 for detail. - "-W", "ignore:module 'sre_constants' is " - "deprecated:DeprecationWarning:pkg_resources._vendor.pyparsing", - # Also caused by `gunicorn.util` importing `pkg_resources`: - "-W", "ignore:Creating a LegacyVersion has been deprecated and " - "will be removed in the next major release:" - "DeprecationWarning:", - # Deprecation warning emitted by setuptools v67.5.0+ triggered by importing - # `gunicorn.util`. - "-W", "ignore:pkg_resources is deprecated as an API:" - "DeprecationWarning", "-c", f"import {import_path!s}", # fmt: on )