Merge branch 'master' into remove-pickle-loading

Author: Dreamsorcerer

.codecov.yml

@@ -1,14 +1,27 @@
 codecov:
   branch: master
   notify:
-    after_n_builds: 13
+    manual_trigger: true
+
+comment:
+  require_head: false
+  require_base: false
 
 coverage:
   range: "95..100"
 
   status:
     project: no
 
+component_management:
+  individual_components:
+    - component_id: project
+      paths:
+        - aiohttp/**
+    - component_id: tests
+      paths:
+        - tests/**
+
 flags:
   library:
     paths:

.coveragerc.toml

@@ -19,4 +19,5 @@ exclude_also = [
   'assert False',
   ': \.\.\.(\s*#.*)?$',
   '^ +\.\.\.$',
+  'pytest.fail\('
 ]

.github/dependabot.yml

@@ -41,3 +41,18 @@ updates:
     schedule:
       interval: "daily"
     open-pull-requests-limit: 10
+
+  - package-ecosystem: "docker"
+    directory: "/tests/autobahn/"
+    labels:
+      - dependencies
+    schedule:
+      interval: "monthly"
+
+  - package-ecosystem: "docker"
+    directory: "/tests/autobahn/"
+    labels:
+      - dependencies
+    target-branch: "3.14"
+    schedule:
+      interval: "monthly"

.github/workflows/ci-cd.yml

@@ -74,7 +74,7 @@ jobs:
       with:
         python-version: 3.11
     - name: Cache PyPI
-      uses: actions/[email protected].3
+      uses: actions/[email protected].4
       with:
         key: pip-lint-${{ hashFiles('requirements/*.txt') }}
         path: ~/.cache/pip
@@ -132,7 +132,7 @@ jobs:
       with:
         submodules: true
     - name: Cache llhttp generated files
-      uses: actions/[email protected].3
+      uses: actions/[email protected].4
       id: cache
       with:
         key: llhttp-${{ hashFiles('vendor/llhttp/package*.json', 'vendor/llhttp/src/**/*') }}
@@ -199,7 +199,7 @@ jobs:
         echo "dir=$(pip cache dir)" >> "${GITHUB_OUTPUT}"
       shell: bash
     - name: Cache PyPI
-      uses: actions/[email protected].3
+      uses: actions/[email protected].4
       with:
         key: pip-ci-${{ runner.os }}-${{ matrix.pyver }}-${{ matrix.no-extensions }}-${{ hashFiles('requirements/*.txt') }}
         path: ${{ steps.pip-cache.outputs.dir }}
@@ -218,7 +218,7 @@ jobs:
       run: echo "PYTHON_GIL=0" >> $GITHUB_ENV
     - name: Restore llhttp generated files
       if: ${{ matrix.no-extensions == '' }}
-      uses: actions/download-artifact@v7
+      uses: actions/download-artifact@v8
       with:
         name: llhttp
         path: vendor/llhttp/build/
@@ -237,7 +237,7 @@ jobs:
         PIP_USER: 1
       run: >-
         PATH="${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH}"
-        pytest --junitxml=junit.xml
+        pytest --junitxml=junit.xml -m 'not dev_mode and not autobahn'
       shell: bash
     - name: Re-run the failing tests with maximum verbosity
       if: failure()
@@ -264,7 +264,99 @@ jobs:
     - name: Upload coverage
       uses: codecov/codecov-action@v5
       with:
-        file: ./coverage.xml
+        files: ./coverage.xml
+        flags: >-
+          CI-GHA,OS-${{
+            runner.os
+          }},VM-${{
+            matrix.os
+          }},Py-${{
+            steps.python-install.outputs.python-version
+          }}
+        token: ${{ secrets.CODECOV_TOKEN }}
+    - name: Upload test results to Codecov
+      if: ${{ !cancelled() }}
+      uses: codecov/test-results-action@v1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+
+  autobahn:
+    permissions:
+      contents: read # to fetch code (actions/checkout)
+
+    name: Autobahn testsuite
+    needs: gen_llhttp
+    strategy:
+      matrix:
+        pyver: ['3.14']
+        no-extensions: ['']
+        os: [ubuntu]
+      fail-fast: true
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+      with:
+        submodules: true
+    - name: Setup Python ${{ matrix.pyver }}
+      id: python-install
+      uses: actions/setup-python@v6
+      with:
+        allow-prereleases: true
+        python-version: ${{ matrix.pyver }}
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "dir=$(pip cache dir)" >> "${GITHUB_OUTPUT}"
+      shell: bash
+    - name: Cache PyPI
+      uses: actions/[email protected]
+      with:
+        key: pip-ci-${{ runner.os }}-${{ matrix.pyver }}-${{ matrix.no-extensions }}-${{ hashFiles('requirements/*.txt') }}
+        path: ${{ steps.pip-cache.outputs.dir }}
+        restore-keys: |
+            pip-ci-${{ runner.os }}-${{ matrix.pyver }}-${{ matrix.no-extensions }}-
+    - name: Update pip, wheel, setuptools, build, twine
+      run: |
+        python -m pip install -U pip wheel setuptools build twine
+    - name: Install dependencies
+      env:
+        DEPENDENCY_GROUP: test${{ endsWith(matrix.pyver, 't') && '-ft' || '' }}
+      run: |
+        python -Im pip install -r requirements/${{ env.DEPENDENCY_GROUP }}.in -c requirements/${{ env.DEPENDENCY_GROUP }}.txt
+    - name: Restore llhttp generated files
+      if: ${{ matrix.no-extensions == '' }}
+      uses: actions/download-artifact@v8
+      with:
+        name: llhttp
+        path: vendor/llhttp/build/
+    - name: Cythonize
+      if: ${{ matrix.no-extensions == '' }}
+      run: |
+        make cythonize
+    - name: Install self
+      env:
+        AIOHTTP_NO_EXTENSIONS: ${{ matrix.no-extensions }}
+      run: python -m pip install -e .
+    - name: Run unittests
+      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 --numprocesses=0 -m autobahn
+      shell: bash
+    - name: Turn coverage into xml
+      env:
+        COLOR: 'yes'
+        PIP_USER: 1
+      run: |
+        python -m coverage xml
+    - name: Upload coverage
+      uses: codecov/codecov-action@v5
+      with:
+        files: ./coverage.xml
         flags: >-
           CI-GHA,OS-${{
             runner.os
@@ -308,7 +400,7 @@ jobs:
       run: |
         python -m pip install -r requirements/test.in -c requirements/test.txt
     - name: Restore llhttp generated files
-      uses: actions/download-artifact@v7
+      uses: actions/download-artifact@v8
       with:
         name: llhttp
         path: vendor/llhttp/build/
@@ -330,6 +422,7 @@ jobs:
     needs:
     - lint
     - test
+    - autobahn
 
     runs-on: ubuntu-latest
 
@@ -338,6 +431,12 @@ jobs:
       uses: re-actors/alls-green@release/v1
       with:
         jobs: ${{ toJSON(needs) }}
+    - name: Trigger codecov notification
+      uses: codecov/codecov-action@v5
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        fail_ci_if_error: true
+        run_command: send-notifications
 
   pre-deploy:
     name: Pre-Deploy
@@ -373,7 +472,7 @@ jobs:
         python -m
         pip install -r requirements/cython.in -c requirements/cython.txt
     - name: Restore llhttp generated files
-      uses: actions/download-artifact@v7
+      uses: actions/download-artifact@v8
       with:
         name: llhttp
         path: vendor/llhttp/build/
@@ -438,7 +537,7 @@ jobs:
         submodules: true
     - name: Set up QEMU
       if: ${{ matrix.qemu }}
-      uses: docker/setup-qemu-action@v3
+      uses: docker/setup-qemu-action@v4
       with:
         platforms: all
         # This should be temporary
@@ -466,15 +565,15 @@ jobs:
         python -m
         pip install -r requirements/cython.in -c requirements/cython.txt
     - name: Restore llhttp generated files
-      uses: actions/download-artifact@v7
+      uses: actions/download-artifact@v8
       with:
         name: llhttp
         path: vendor/llhttp/build/
     - name: Cythonize
       run: |
         make cythonize
     - name: Build wheels
-      uses: pypa/cibuildwheel@v3.3.1
+      uses: pypa/cibuildwheel@v3.4.0
       env:
         CIBW_SKIP: pp* ${{ matrix.musl == 'musllinux' && '*manylinux*' || '*musllinux*' }}
         CIBW_ARCHS_MACOS: x86_64 arm64 universal2
@@ -516,7 +615,7 @@ jobs:
       run: |
         echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
     - name: Download distributions
-      uses: actions/download-artifact@v7
+      uses: actions/download-artifact@v8
       with:
         path: dist
         pattern: dist-*

.pre-commit-config.yaml

@@ -60,11 +60,11 @@ repos:
       - flake8-no-implicit-concat==0.3.4
       - flake8-requirements==1.7.8
 - repo: https://github.com/PyCQA/isort
-  rev: '7.0.0'
+  rev: '8.0.1'
   hooks:
   - id: isort
 - repo: https://github.com/psf/black-pre-commit-mirror
-  rev: '25.9.0'
+  rev: '26.3.1'
   hooks:
     - id: black
       language_version: python3 # Should be a command that runs python
@@ -99,7 +99,7 @@ repos:
   - id: detect-private-key
     exclude: ^examples/
 - repo: https://github.com/asottile/pyupgrade
-  rev: 'v3.21.0'
+  rev: 'v3.21.2'
   hooks:
   - id: pyupgrade
     args: ['--py37-plus']
@@ -121,7 +121,7 @@ repos:
     exclude: >-
       ^CHANGES\.rst$
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.4.1
+  rev: v2.4.2
   hooks:
   - id: codespell
     additional_dependencies:

CHANGES/10596.bugfix.rst

@@ -0,0 +1,4 @@
+Fixed server hanging indefinitely when chunked transfer encoding chunk-size
+does not match actual data length. The server now raises
+``TransferEncodingError`` instead of waiting forever for data that will
+never arrive -- by :user:`Fridayai700`.

CHANGES/10611.bugfix.rst

@@ -0,0 +1,3 @@
+Reject HTTP requests with duplicate ``chunked`` Transfer-Encoding
+(e.g. ``Transfer-Encoding: chunked, chunked``) with a
+``BadHttpMessage`` error, per :rfc:`9112` section 7.1 -- by :user:`worksbyfriday`.

CHANGES/10665.feature.rst

@@ -0,0 +1 @@
+Added :py:attr:`~aiohttp.web.TCPSite.port` accessor for dynamic port allocations in :class:`~aiohttp.web.TCPSite` -- by :user:`twhittock-disguise` and :user:`rodrigobnogueira`.

CHANGES/10683.bugfix.rst

@@ -0,0 +1 @@
+Fixed misleading TLS-in-TLS warning being emitted when sending HTTPS requests through an HTTP proxy. The warning now only fires when the proxy itself uses HTTPS, which is the only case where TLS-in-TLS actually applies -- by :user:`wavebyrd`.

CHANGES/10753.bugfix.rst

@@ -0,0 +1 @@
+Widened ``trace_request_ctx`` parameter type from ``Mapping[str, Any] | None`` to ``object`` to allow passing instances of user-defined classes as trace context -- by :user:`nightcityblade`.