Merge branch 'master' into dependabot/pip/requirements/certifi-2022.12.7

.github/ISSUE_TEMPLATE/config.yml

@@ -4,8 +4,8 @@ contact_links:
 - name: 🤷💻🤦 StackOverflow
   url: https://stackoverflow.com/questions/tagged/aiohttp
   about: Please ask typical Q&A here
-- name: 💬 Discourse
-  url: https://aio-libs.discourse.group/
+- name: 💬 Github Discussions
+  url: https://github.com/aio-libs/aiohttp/discussions
   about: Please start usage discussions here
 - name: 💬 Gitter Chat
   url: https://gitter.im/aio-libs/Lobby

.github/workflows/ci.yml → .github/workflows/ci-cd.yml

@@ -69,9 +69,9 @@ jobs:
         # can be scanned by slotscheck.
         pip install -r requirements/base.txt -c requirements/constraints.txt
         slotscheck -v -m aiohttp
-    - name: Install libenchant-dev
+    - name: Install libenchant
       run: |
-        sudo apt install libenchant-dev
+        sudo apt install libenchant-2-dev
     - name: Install spell checker
       run: |
         pip install -r requirements/doc-spelling.txt -c requirements/constraints.txt
@@ -133,15 +133,13 @@ jobs:
     needs: gen_llhttp
     strategy:
       matrix:
-        pyver: [3.7, 3.8, 3.9, '3.10']
+        pyver: [3.8, 3.9, '3.10']
         no-extensions: ['', 'Y']
         os: [ubuntu, macos, windows]
         experimental: [false]
         exclude:
           - os: macos
             no-extensions: 'Y'
-          - os: macos
-            pyver: 3.7
           - os: macos
             pyver: 3.8
           - os: windows
@@ -152,15 +150,27 @@ jobs:
             os: ubuntu
             experimental: false
           - os: macos
-            pyver: "3.11.0-alpha - 3.11.0"
+            pyver: "3.11"
             experimental: true
             no-extensions: 'Y'
           - os: ubuntu
-            pyver: "3.11.0-alpha - 3.11.0"
+            pyver: "3.11"
             experimental: false
             no-extensions: 'Y'
           - os: windows
-            pyver: "3.11.0-alpha - 3.11.0"
+            pyver: "3.11"
+            experimental: true
+            no-extensions: 'Y'
+          - os: ubuntu
+            pyver: "3.12"
+            experimental: true
+            no-extensions: 'Y'
+          - os: macos
+            pyver: "3.12"
+            experimental: true
+            no-extensions: 'Y'
+          - os: windows
+            pyver: "3.12"
             experimental: true
             no-extensions: 'Y'
       fail-fast: true
@@ -175,6 +185,7 @@ jobs:
       id: python-install
       uses: actions/setup-python@v4
       with:
+        allow-prereleases: true
         python-version: ${{ matrix.pyver }}
     - name: Get pip cache dir
       id: pip-cache
@@ -359,7 +370,7 @@ jobs:
       run: |
         make cythonize
     - name: Build wheels
-      uses: pypa/cibuildwheel@v2.10.1
+      uses: pypa/cibuildwheel@v2.14.1
       env:
         CIBW_ARCHS_MACOS: x86_64 arm64 universal2
     - uses: actions/upload-artifact@v3
@@ -368,13 +379,18 @@ jobs:
         path: ./wheelhouse/*.whl
 
   deploy:
-    permissions:
-      contents: write # to make release
-
     name: Deploy
-    environment: release
     needs: [build-tarball, build-wheels]
     runs-on: ubuntu-latest
+
+    permissions:
+      contents: write  # IMPORTANT: mandatory for making GitHub Releases
+      id-token: write  # IMPORTANT: mandatory for trusted publishing & sigstore
+
+    environment:
+      name: pypi
+      url: https://pypi.org/p/aiohttp
+
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -401,7 +417,27 @@ jobs:
         name: aiohttp
         version_file: aiohttp/__init__.py
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        pypi_token: ${{ secrets.PYPI_API_TOKEN }}
         dist_dir: dist
         fix_issue_regex: "`#(\\d+) <https://github.com/aio-libs/aiohttp/issues/\\1>`_"
         fix_issue_repl: "(#\\1)"
+
+    - name: >-
+        Publish 🐍📦 to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+
+    - name: Sign the dists with Sigstore
+      uses: sigstore/gh-action-sigstore-python@v1.2.3
+      with:
+        inputs: >-
+          ./dist/*.tar.gz
+          ./dist/*.whl
+
+    - name: Upload artifact signatures to GitHub Release
+      # Confusingly, this action also supports updating releases, not
+      # just creating them. This is what we want here, since we've manually
+      # created the release above.
+      uses: softprops/action-gh-release@v1
+      with:
+        # dist/ contains the built packages, which smoketest-artifacts/
+        # contains the signatures and certificates.
+        files: dist/**

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "vendor/llhttp"]
     path = vendor/llhttp
     url = https://github.com/nodejs/llhttp.git
-    branch = v6.0.6
+    branch = v8.x

.mypy.ini

@@ -35,11 +35,5 @@ ignore_missing_imports = True
 [mypy-gunicorn.*]
 ignore_missing_imports = True
 
-[mypy-tokio]
-ignore_missing_imports = True
-
-[mypy-uvloop]
-ignore_missing_imports = True
-
 [mypy-python_on_whales]
 ignore_missing_imports = True

.pre-commit-config.yaml

@@ -26,15 +26,15 @@ repos:
   hooks:
   - id: check-merge-conflict
 - repo: https://github.com/asottile/yesqa
-  rev: v1.4.0
+  rev: v1.5.0
   hooks:
   - id: yesqa
 - repo: https://github.com/PyCQA/isort
-  rev: '5.10.1'
+  rev: '5.12.0'
   hooks:
   - id: isort
 - repo: https://github.com/psf/black
-  rev: '22.10.0'
+  rev: '23.7.0'
   hooks:
     - id: black
       language_version: python3 # Should be a command that runs python
@@ -72,7 +72,7 @@ repos:
   - id: detect-private-key
     exclude: ^examples/
 - repo: https://github.com/asottile/pyupgrade
-  rev: 'v3.3.0'
+  rev: 'v3.9.0'
   hooks:
   - id: pyupgrade
     args: ['--py36-plus']
@@ -82,6 +82,7 @@ repos:
   - id: flake8
     additional_dependencies:
       - flake8-docstrings==1.6.0
+      - flake8-requirements==1.7.8
     exclude: "^docs/"
 - repo: https://github.com/Lucas-C/pre-commit-hooks-markup
   rev: v1.0.1

.readthedocs.yml

@@ -6,14 +6,16 @@
 version: 2
 
 submodules:
-  include: all  # []
+  include: all
   exclude: []
   recursive: true
 
 build:
-  image: latest
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
 python:
-  version: 3.8
   install:
   - method: pip
     path: .

CHANGES.rst

@@ -10,6 +10,21 @@
 
 .. towncrier release notes start
 
+3.8.4 (2023-02-12)
+==================
+
+Bugfixes
+--------
+
+- Fixed incorrectly overwriting cookies with the same name and domain, but different path.
+  `#6638 <https://github.com/aio-libs/aiohttp/issues/6638>`_
+- Fixed ``ConnectionResetError`` not being raised after client disconnection in SSL environments.
+  `#7180 <https://github.com/aio-libs/aiohttp/issues/7180>`_
+
+
+----
+
+
 3.8.3 (2022-09-21)
 ==================
 

CHANGES/.TEMPLATE.rst

@@ -12,8 +12,8 @@
 
 {% if definitions[category]['showcontent'] %}
 {% for text, values in sections[section][category].items() %}
-- {{ text }}
-  {{ values|join(',\n  ') }}
+- {{ text + '\n' }}
+  {{ values|join(',\n  ') + '\n' }}
 {% endfor %}
 
 {% else %}

CHANGES/2304.feature

@@ -0,0 +1 @@
+Support setting response header parameters max_line_size and max_field_size.

CHANGES/3355.bugfix

@@ -0,0 +1 @@
+Fixed a transport is :data:`None` error -- by :user:`Dreamsorcerer`.

CHANGES/5854.bugfix

@@ -0,0 +1 @@
+Fixed client timeout not working when incoming data is always available without waiting -- by :user:`Dreamsorcerer`.

CHANGES/5934.misc

@@ -0,0 +1 @@
+Add flake8-requirements to linting.

CHANGES/6594.feature

@@ -0,0 +1,2 @@
+Exported ``HTTPMove`` which can be used to catch any redirection request
+that has a location -- :user:`dreamsorcerer`.

CHANGES/7056.feature

@@ -0,0 +1 @@
+Added `handler_cancellation <https://docs.aiohttp.org/en/stable/web_advanced.html#web-handler-cancellation>`_ parameter to cancel web handler on client disconnection. -- by :user:`mosquito`

CHANGES/7107.removal

@@ -0,0 +1 @@
+Removed deprecated ``.loop``, ``.setUpAsync()``, ``.tearDownAsync()`` and ``.get_app()`` from ``AioHTTPTestCase``.

CHANGES/7131.feature

@@ -0,0 +1 @@
+Added support for using Basic Auth credentials from :file:`.netrc` file when making HTTP requests with the :py:class:`~aiohttp.ClientSession` ``trust_env`` argument is set to ``True`` -- by :user:`yuvipanda`.

CHANGES/7149.bugfix

@@ -0,0 +1 @@
+changed ``sock_read`` timeout to start after writing has finished, to avoid read timeouts caused by an unfinished write. -- by :user:`dtrifiro`

CHANGES/7188.feature

@@ -0,0 +1 @@
+Added a graceful shutdown period which allows pending tasks to complete before the application's cleanup is called. The period can be adjusted with the ``shutdown_timeout`` parameter -- by :user:`Dreamsorcerer`.

CHANGES/7191.misc

@@ -0,0 +1 @@
+Made tests pass after the year 2039.

CHANGES/7213.misc

@@ -0,0 +1 @@
+Increase base_protocol.py test coverage.

CHANGES/7237.bugfix

@@ -0,0 +1 @@
+Fixed ``PermissionError`` when .netrc is unreadable due to permissions.

CHANGES/7240.feature

@@ -0,0 +1 @@
+Turned access log into no-op when the logger is disabled.

CHANGES/7259.bugfix

@@ -0,0 +1 @@
+Fixed missing query in tracing method URLs when using ``yarl`` 1.9+.

CHANGES/7281.removal

@@ -0,0 +1 @@
+Removed support for unsupported ``tokio`` event loop -- by :user:`Dreamsorcerer`

CHANGES/7283.doc

@@ -0,0 +1 @@
+Added a note about possibly needing to update headers when using ``on_response_prepare`` -- by :user:`Dreamsorcerer`

CHANGES/7302.bugfix

@@ -0,0 +1 @@
+Changed max 32-bit timestamp to an aware datetime object, for consistency with the non-32-bit one, and to avoid a DeprecationWarning on Python 3.12.

CHANGES/7325.doc

@@ -0,0 +1 @@
+Complete trust_env parameter description to honor wss_proxy, ws_proxy or no_proxy env

CHANGES/7334.doc

@@ -0,0 +1 @@
+Expanded SSL documentation with more examples (e.g. how to use certifi). -- by :user:`Dreamsorcerer`

CHANGES/7335.misc

@@ -0,0 +1 @@
+Fixed annotation of ``ssl`` parameter to disallow ``True``. -- by :user:`Dreamsorcerer`

CHANGES/7336.removal

@@ -0,0 +1 @@
+Dropped support for Python 3.7. -- by :user:`Dreamsorcerer`

CHANGES/7346.feature

@@ -0,0 +1,5 @@
+Upgrade the vendored copy of llhttp_ to v8.1.1 -- by :user:`webknjaz`.
+
+Thanks to :user:`sethmlarson` for pointing this out!
+
+.. _llhttp: https://llhttp.org

CHANGES/7365.feature

@@ -0,0 +1 @@
+Added typing information to ``RawResponseMessage`` -- by :user:`Gobot1234`

CHANGES/7366.feature

@@ -0,0 +1 @@
+Added information to C parser exceptions to show which character caused the error. -- by :user:`Dreamsorcerer`

CONTRIBUTORS.txt

@@ -84,6 +84,7 @@ Dan Xu
 Daniel García
 Daniel Grossmann-Kavanagh
 Daniel Nelson
+Daniele Trifirò
 Danny Song
 David Bibb
 David Michael Brown
@@ -155,12 +156,14 @@ Ilya Gruzinov
 Ingmar Steen
 Ivan Lakovic
 Ivan Larin
+J. Nick Koston
 Jacob Champion
 Jaesung Lee
 Jake Davis
 Jakob Ackermann
 Jakub Wilk
 Jan Buchar
+Jan Gosmann
 Jarno Elonen
 Jashandeep Sohi
 Jean-Baptiste Estival
@@ -200,6 +203,7 @@ Krzysztof Blazewicz
 Kyrylo Perevozchikov
 Kyungmin Lee
 Lars P. Søndergaard
+Lee LieWhite
 Liu Hua
 Louis-Philippe Huberdeau
 Loïc Lajeanne
@@ -353,6 +357,7 @@ Yury Pliner
 Yury Selivanov
 Yusuke Tsutsumi
 Yuval Ofir
+Yuvi Panda
 Zainab Lawal
 Zeal Wierslee
 Zlatan Sičanica

Makefile

@@ -117,11 +117,7 @@ define run_tests_in_docker
 	docker run --rm -ti -v `pwd`:/src -w /src "aiohttp-test-$(1)-$(2)" $(TEST_SPEC)
 endef
 
-.PHONY: test-3.7-no-extensions test-3.7 test-3.8-no-extensions test-3.8 test-3.9-no-extensions test-3.9 test-3.10-no-extensions test-3.10
-test-3.7-no-extensions:
-	$(call run_tests_in_docker,3.7,y)
-test-3.7:
-	$(call run_tests_in_docker,3.7,n)
+.PHONY: test-3.8-no-extensions test-3.8 test-3.9-no-extensions test
 test-3.8-no-extensions:
 	$(call run_tests_in_docker,3.8,y)
 test-3.8: