Merge branch 'master' into patch-1

Author: Dreamsorcerer

.github/workflows/ci-cd.yml

@@ -51,7 +51,7 @@ jobs:
       with:
         python-version: 3.11
     - name: Cache PyPI
-      uses: actions/cache@v4.2.4
+      uses: actions/cache@v4.3.0
       with:
         key: pip-lint-${{ hashFiles('requirements/*.txt') }}
         path: ~/.cache/pip
@@ -109,14 +109,14 @@ jobs:
       with:
         submodules: true
     - name: Cache llhttp generated files
-      uses: actions/cache@v4.2.4
+      uses: actions/cache@v4.3.0
       id: cache
       with:
         key: llhttp-${{ hashFiles('vendor/llhttp/package*.json', 'vendor/llhttp/src/**/*') }}
         path:  vendor/llhttp/build
     - name: Setup NodeJS
       if: steps.cache.outputs.cache-hit != 'true'
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v5
       with:
         node-version: 18
     - name: Generate llhttp sources
@@ -138,7 +138,7 @@ jobs:
     needs: gen_llhttp
     strategy:
       matrix:
-        pyver: [3.9, '3.10', '3.11', '3.12', '3.13']
+        pyver: [3.9, '3.10', '3.11', '3.12', '3.13', '3.14']
         no-extensions: ['', 'Y']
         os: [ubuntu, macos, windows]
         experimental: [false]
@@ -152,13 +152,10 @@ jobs:
             no-extensions: 'Y'
             os: ubuntu
             experimental: false
-          - os: ubuntu
-            pyver: "3.14"
-            experimental: true
-            no-extensions: 'Y'
           - os: ubuntu
             pyver: "3.14t"
-            experimental: true
+            no-extensions: ''
+            experimental: false
       fail-fast: true
     runs-on: ${{ matrix.os }}-latest
     continue-on-error: ${{ matrix.experimental }}
@@ -179,7 +176,7 @@ jobs:
         echo "dir=$(pip cache dir)" >> "${GITHUB_OUTPUT}"
       shell: bash
     - name: Cache PyPI
-      uses: actions/cache@v4.2.4
+      uses: actions/cache@v4.3.0
       with:
         key: pip-ci-${{ runner.os }}-${{ matrix.pyver }}-${{ matrix.no-extensions }}-${{ hashFiles('requirements/*.txt') }}
         path: ${{ steps.pip-cache.outputs.dir }}
@@ -295,8 +292,9 @@ jobs:
     - name: Install self
       run: python -m pip install -e .
     - name: Run benchmarks
-      uses: CodSpeedHQ/action@v3
+      uses: CodSpeedHQ/action@v4
       with:
+        mode: instrumentation
         token: ${{ secrets.CODSPEED_TOKEN }}
         run: python -Im pytest --no-cov --numprocesses=0 -vvvvv --codspeed
 

.github/workflows/labels.yml

@@ -11,7 +11,7 @@ jobs:
     name: Backport label added
     if: ${{ github.event.pull_request.user.type != 'Bot' }}
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.pre-commit-config.yaml

@@ -64,7 +64,7 @@ repos:
   hooks:
   - id: isort
 - repo: https://github.com/psf/black
-  rev: '25.1.0'
+  rev: '25.9.0'
   hooks:
     - id: black
       language_version: python3 # Should be a command that runs python

CHANGES/11546.contrib.rst

@@ -0,0 +1,2 @@
+Fixed ``test_send_compress_text`` failing when alternative zlib implementation
+is used. (``zlib-ng`` in python 3.14 windows build) -- by :user:`Cycloctane`.

CONTRIBUTORS.txt

@@ -223,6 +223,7 @@ Kilian Guillaume
 Kimmo Parviainen-Jalanko
 Kirill Klenov
 Kirill Malovitsa
+Kirill Potapenko
 Konstantin Shutkin
 Konstantin Valetov
 Krzysztof Blazewicz

aiohttp/client_reqrep.py

@@ -59,6 +59,7 @@
     netrc_from_env,
     parse_mimetype,
     reify,
+    sentinel,
     set_exception,
     set_result,
 )
@@ -137,14 +138,14 @@ def __new__(
         url: URL,
         method: str,
         headers: "CIMultiDictProxy[str]",
-        real_url: URL = _SENTINEL,  # type: ignore[assignment]
+        real_url: Union[URL, _SENTINEL] = sentinel,
     ) -> "RequestInfo":
         """Create a new RequestInfo instance.
 
         For backwards compatibility, the real_url parameter is optional.
         """
         return tuple.__new__(
-            cls, (url, method, headers, url if real_url is _SENTINEL else real_url)
+            cls, (url, method, headers, url if real_url is sentinel else real_url)
         )
 
 

requirements/constraints.txt

@@ -27,7 +27,7 @@ babel==2.17.0
 blockbuster==1.5.25
     # via
     #   -r requirements/lint.in
-    #   -r requirements/test.in
+    #   -r requirements/test-common.in
 brotli==1.1.0 ; platform_python_implementation == "CPython"
     # via -r requirements/runtime-deps.in
 build==1.3.0
@@ -52,11 +52,11 @@ click==8.1.8
     #   slotscheck
     #   towncrier
     #   wait-for-it
-coverage==7.10.6
+coverage==7.10.7
     # via
-    #   -r requirements/test.in
+    #   -r requirements/test-common.in
     #   pytest-cov
-cryptography==46.0.1
+cryptography==46.0.2
     # via
     #   pyjwt
     #   trustme
@@ -77,7 +77,7 @@ forbiddenfruit==0.1.4
 freezegun==1.5.5
     # via
     #   -r requirements/lint.in
-    #   -r requirements/test.in
+    #   -r requirements/test-common.in
 frozenlist==1.7.0
     # via
     #   -r requirements/runtime-deps.in
@@ -86,7 +86,7 @@ gidgethub==5.4.0
     # via cherry-picker
 gunicorn==23.0.0
     # via -r requirements/base.in
-identify==2.6.14
+identify==2.6.15
     # via pre-commit
 idna==3.6
     # via
@@ -100,14 +100,14 @@ iniconfig==2.1.0
 isal==1.7.2 ; python_version < "3.14"
     # via
     #   -r requirements/lint.in
-    #   -r requirements/test.in
+    #   -r requirements/test-common.in
 jinja2==3.1.6
     # via
     #   sphinx
     #   towncrier
 markdown-it-py==3.0.0
     # via rich
-markupsafe==3.0.2
+markupsafe==3.0.3
     # via jinja2
 mdurl==0.1.2
     # via markdown-it-py
@@ -116,10 +116,10 @@ multidict==6.6.4
     #   -r requirements/multidict.in
     #   -r requirements/runtime-deps.in
     #   yarl
-mypy==1.17.1 ; implementation_name == "cpython"
+mypy==1.18.2 ; implementation_name == "cpython"
     # via
     #   -r requirements/lint.in
-    #   -r requirements/test.in
+    #   -r requirements/test-common.in
 mypy-extensions==1.1.0
     # via mypy
 nodeenv==1.9.1
@@ -133,10 +133,10 @@ packaging==25.0
     #   wheel
 pathspec==0.12.1
     # via mypy
-pip-tools==7.5.0
+pip-tools==7.5.1
     # via -r requirements/dev.in
 pkgconfig==1.5.5
-    # via -r requirements/test.in
+    # via -r requirements/test-common.in
 platformdirs==4.4.0
     # via virtualenv
 pluggy==1.6.0
@@ -152,7 +152,7 @@ propcache==0.3.2
 proxy-py==2.4.10
     # via
     #   -r requirements/lint.in
-    #   -r requirements/test.in
+    #   -r requirements/test-common.in
 pycares==4.11.0
     # via aiodns
 pycparser==2.23
@@ -179,30 +179,30 @@ pyproject-hooks==1.2.0
 pytest==8.4.2
     # via
     #   -r requirements/lint.in
-    #   -r requirements/test.in
+    #   -r requirements/test-common.in
     #   pytest-codspeed
     #   pytest-cov
     #   pytest-mock
     #   pytest-xdist
 pytest-codspeed==4.0.0
     # via
     #   -r requirements/lint.in
-    #   -r requirements/test.in
+    #   -r requirements/test-common.in
 pytest-cov==7.0.0
-    # via -r requirements/test.in
+    # via -r requirements/test-common.in
 pytest-mock==3.15.1
     # via
     #   -r requirements/lint.in
-    #   -r requirements/test.in
+    #   -r requirements/test-common.in
 pytest-xdist==3.8.0
-    # via -r requirements/test.in
+    # via -r requirements/test-common.in
 python-dateutil==2.9.0.post0
     # via freezegun
 python-on-whales==0.78.0
     # via
     #   -r requirements/lint.in
-    #   -r requirements/test.in
-pyyaml==6.0.2
+    #   -r requirements/test-common.in
+pyyaml==6.0.3
     # via pre-commit
 requests==2.32.5
     # via
@@ -212,7 +212,7 @@ requests==2.32.5
 rich==14.1.0
     # via pytest-codspeed
 setuptools-git==1.2
-    # via -r requirements/test.in
+    # via -r requirements/test-common.in
 six==1.17.0
     # via python-dateutil
 slotscheck==0.19.1
@@ -262,7 +262,7 @@ towncrier==25.8.0
 trustme==1.2.1 ; platform_machine != "i686"
     # via
     #   -r requirements/lint.in
-    #   -r requirements/test.in
+    #   -r requirements/test-common.in
 typing-extensions==4.15.0
     # via
     #   aiosignal
@@ -275,7 +275,7 @@ typing-extensions==4.15.0
     #   python-on-whales
     #   typing-inspection
     #   virtualenv
-typing-inspection==0.4.1
+typing-inspection==0.4.2
     # via pydantic
 uritemplate==4.2.0
     # via gidgethub
@@ -290,15 +290,15 @@ valkey==6.1.1
 virtualenv==20.34.0
     # via pre-commit
 wait-for-it==2.3.0
-    # via -r requirements/test.in
+    # via -r requirements/test-common.in
 wheel==0.46.0
     # via pip-tools
 yarl==1.20.1
     # via -r requirements/runtime-deps.in
 zlib-ng==1.0.0
     # via
     #   -r requirements/lint.in
-    #   -r requirements/test.in
+    #   -r requirements/test-common.in
 zstandard==0.25.0 ; implementation_name == "cpython"
     # via
     #   -r requirements/lint.in