Merge master

.codecov.yml

@@ -1,5 +1,7 @@
 codecov:
   branch: master
+  notify:
+    after_n_builds: 10
 
 coverage:
   range: "95..100"

.github/dependabot.yml

@@ -26,6 +26,7 @@ updates:
     target-branch: "3.8"
     schedule:
       interval: "daily"
+    open-pull-requests-limit: 10
 
   # Maintain dependencies for Python aiohttp 3.8
   - package-ecosystem: "pip"

.github/workflows/auto-merge.yml

@@ -0,0 +1,22 @@
+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/[email protected]
+        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/backport.yml

@@ -21,12 +21,12 @@ jobs:
     # if: ${{ github.event.pull_request.head.repo.full_name == 'aio-libs/aiohttp' }}
     steps:
       - id: generate_token
-        uses: tibdex/github-app-token@v1.3
+        uses: tibdex/github-app-token@v1.4
         with:
           app_id: ${{ secrets.BOT_APP_ID }}
           private_key: ${{ secrets.BOT_PRIVATE_KEY }}
       - name: Backport
-        uses: sqren/[email protected].40
+        uses: sqren/[email protected].41
         with:
           # Required
           # Token to authenticate requests

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
     timeout-minutes: 5
     steps:
     - name: Checkout
-      uses: actions/[email protected].4
+      uses: actions/[email protected].5
       with:
         submodules: true
     - name: Setup Python 3.8
@@ -76,7 +76,7 @@ jobs:
     needs: lint
     strategy:
       matrix:
-        pyver: [3.7, 3.8, 3.9]
+        pyver: [3.7, 3.8, 3.9, '3.10']
         no-extensions: ['', 'Y']
         os: [ubuntu, macos, windows]
         exclude:
@@ -98,7 +98,7 @@ jobs:
     timeout-minutes: 15
     steps:
     - name: Checkout
-      uses: actions/[email protected].4
+      uses: actions/[email protected].5
       with:
         submodules: true
     - name: Setup Python ${{ matrix.pyver }}
@@ -116,6 +116,8 @@ jobs:
         path: ${{ steps.pip-cache.outputs.dir }}
         restore-keys: |
             pip-ci-${{ runner.os }}-${{ matrix.pyver }}-${{ matrix.no-extensions }}-
+    - name: Upgrade wheel  # Needed for proxy.py install not to explode
+      run: pip install -U wheel
     - name: Cythonize
       if: ${{ matrix.no-extensions == '' }}
       run: |
@@ -128,7 +130,7 @@ jobs:
         make vvtest
         python -m coverage xml
     - name: Upload coverage
-      uses: codecov/codecov-action@v1.5.2
+      uses: codecov/codecov-action@v2.1.0
       with:
         file: ./coverage.xml
         flags: unit
@@ -151,7 +153,7 @@ jobs:
     needs: pre-deploy
     steps:
     - name: Checkout
-      uses: actions/[email protected].4
+      uses: actions/[email protected].5
       with:
         submodules: true
     - name: Setup Python 3.8
@@ -174,7 +176,7 @@ jobs:
     name: Linux
     strategy:
       matrix:
-        pyver: [cp37-cp37m, cp38-cp38, cp39-cp39]
+        pyver: [cp37-cp37m, cp38-cp38, cp39-cp39, cp310-cp310]
         arch: [x86_64, aarch64, i686, ppc64le, s390x]
       fail-fast: false
     runs-on: ubuntu-latest
@@ -184,7 +186,7 @@ jobs:
     needs: pre-deploy
     steps:
     - name: Checkout
-      uses: actions/[email protected].4
+      uses: actions/[email protected].5
       with:
         submodules: true
     - name: Set up QEMU
@@ -222,7 +224,7 @@ jobs:
     name: Binary wheels
     strategy:
       matrix:
-        pyver: [3.7, 3.8, 3.9]
+        pyver: [3.7, 3.8, 3.9, '3.10']
         os: [macos, windows]
         arch: [x86, x64]
         exclude:
@@ -233,7 +235,7 @@ jobs:
     needs: pre-deploy
     steps:
     - name: Checkout
-      uses: actions/[email protected].4
+      uses: actions/[email protected].5
       with:
         submodules: true
     - name: Setup Python 3.8

.github/workflows/update-pre-commit.yml

@@ -7,7 +7,7 @@ jobs:
     if: github.repository_owner == 'aiohttp'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/[email protected].4
+    - uses: actions/[email protected].5
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
@@ -19,12 +19,12 @@ jobs:
     - name: Run pre-commit autoupdate
       run: pre-commit autoupdate
     - id: generate_token
-      uses: tibdex/github-app-token@v1.3
+      uses: tibdex/github-app-token@v1.4
       with:
         app_id: ${{ secrets.BOT_APP_ID }}
         private_key: ${{ secrets.BOT_PRIVATE_KEY }}
     - name: Create Pull Request
-      uses: peter-evans/[email protected].0
+      uses: peter-evans/[email protected].1
       with:
         token: ${{ steps.generate_token.outputs.token }}
         branch: update/pre-commit-autoupdate

.mypy.ini

@@ -40,3 +40,6 @@ ignore_missing_imports = True
 
 [mypy-uvloop]
 ignore_missing_imports = True
+
+[mypy-python_on_whales]
+ignore_missing_imports = True

.pre-commit-config.yaml

@@ -7,24 +7,24 @@ repos:
     entry: ./tools/check_changes.py
     pass_filenames: false
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: 'v3.3.0'
+  rev: 'v4.0.1'
   hooks:
   - id: check-merge-conflict
 - repo: https://github.com/asottile/yesqa
-  rev: v1.2.2
+  rev: v1.2.3
   hooks:
   - id: yesqa
-- repo: https://github.com/pre-commit/mirrors-isort
-  rev: 'v5.6.4'
+- repo: https://github.com/PyCQA/isort
+  rev: '5.9.3'
   hooks:
   - id: isort
 - repo: https://github.com/psf/black
-  rev: '20.8b1'
+  rev: '21.9b0'
   hooks:
     - id: black
       language_version: python3 # Should be a command that runs python3.6+
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: 'v3.3.0'
+  rev: 'v4.0.1'
   hooks:
   - id: end-of-file-fixer
     exclude: >-
@@ -60,18 +60,18 @@ repos:
   - id: detect-private-key
     exclude: ^examples/
 - repo: https://github.com/asottile/pyupgrade
-  rev: 'v2.7.4'
+  rev: 'v2.29.0'
   hooks:
   - id: pyupgrade
     args: ['--py36-plus']
-- repo: https://gitlab.com/pycqa/flake8
-  rev: '3.8.4'
+- repo: https://github.com/PyCQA/flake8
+  rev: '4.0.1'
   hooks:
   - id: flake8
     exclude: "^docs/"
 
 - repo: git://github.com/Lucas-C/pre-commit-hooks-markup
-  rev: v1.0.0
+  rev: v1.0.1
   hooks:
   - id: rst-linter
     files: >-

.readthedocs.yml

@@ -1,5 +1,21 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html
+# for details
+
+---
+version: 2
+
+submodules:
+  include: all  # []
+  exclude: []
+  recursive: true
+
 build:
   image: latest
 python:
-  version: 3.6
-  pip_install: false
+  version: 3.8
+  install:
+  - method: pip
+    path: .
+  - requirements: requirements/doc.txt
+...

CHANGES.rst

@@ -1,7 +1,3 @@
-=========
-Changelog
-=========
-
 ..
     You should *NOT* be adding new change log entries to this file, this
     file is managed by towncrier. You *may* edit previous change logs to

CHANGES/3559.doc

@@ -1 +1 @@
-Clarified WebSocketResponse closure in quickstart example.
+Clarified ``WebSocketResponse`` closure in the quick start example.

CHANGES/3828.feature

@@ -1,4 +1,4 @@
-Disable implicit switch-back to pure python mode. The build fails loudly if aiohttp
-cannot be compiled with C Accellerators.  Use AIOHTTP_NO_EXTENSIONS=1 to explicitly
+Disabled implicit switch-back to pure python mode. The build fails loudly if aiohttp
+cannot be compiled with C Accelerators.  Use `AIOHTTP_NO_EXTENSIONS=1` to explicitly
 disable C Extensions complication and switch to Pure-Python mode.  Note that Pure-Python
 mode is significantly slower than compiled one.

CHANGES/4054.feature

@@ -1 +1 @@
-Implemented readuntil in StreamResponse
+Implemented ``readuntil`` in ``StreamResponse``

CHANGES/4247.1.misc

@@ -0,0 +1 @@
+Automated running autobahn test suite by integrating with pytest.

CHANGES/4277.feature

@@ -1 +1 @@
-Add set_cookie and del_cookie methods to HTTPException
+Added ``set_cookie`` and ``del_cookie`` methods to ``HTTPException``

CHANGES/4299.bugfix

@@ -1 +1 @@
-Delete older code in example (examples/web_classview.py)
+Delete older code in example (:file:`examples/web_classview.py`)

CHANGES/4302.bugfix

@@ -1 +1 @@
-Fixed the support of route handlers wrapped by functools.partial()
+Fixed the support of route handlers wrapped by :py:func:`functools.partial`

CHANGES/4452.doc

@@ -1 +1 @@
-Fix typo in client_quickstart docs.
+Fixed a typo in the ``client_quickstart`` doc.

CHANGES/4700.feature

@@ -1,6 +1,6 @@
-AioHTTPTestCase is more async friendly now.
+``AioHTTPTestCase`` is more async friendly now.
 
-For people who use unittest and are used to use unittest.TestCase
-it will be easier to write new test cases like the sync version of the TestCase class,
+For people who use unittest and are used to use :py:exc:`~unittest.TestCase`
+it will be easier to write new test cases like the sync version of the :py:exc:`~unittest.TestCase` class,
 without using the decorator `@unittest_run_loop`, just `async def test_*`.
-The only difference is that for the people using python3.7 and below a new dependency is needed, it is `asynctestcase`.
+The only difference is that for the people using python3.7 and below a new dependency is needed, it is ``asynctestcase``.

CHANGES/4818.feature

@@ -0,0 +1 @@
+Add validation of HTTP header keys and values to prevent header injection.

CHANGES/5326.doc

@@ -1 +1 @@
-Refactor OpenAPI/Swagger aiohttp addons, added aio-openapi
+Refactored OpenAPI/Swagger aiohttp addons, added ``aio-openapi``

CHANGES/5634.feature

@@ -0,0 +1 @@
+A warning was added, when a cookie's length exceeds the :rfc:`6265` minimum client support -- :user:`anesabml`.

CHANGES/5727.bugfix

@@ -0,0 +1 @@
+ Remove incorrect default from docs

CHANGES/5783.feature

@@ -0,0 +1 @@
+Started keeping the ``Authorization`` header during HTTP -> HTTPS redirects when the host remains the same.

CHANGES/5806.misc

@@ -0,0 +1 @@
+Remove last remnants of attrs library.

CHANGES/5840.bugfix

@@ -0,0 +1 @@
+Remove external test dependency to http://httpbin.org

CHANGES/5870.misc

@@ -0,0 +1 @@
+Simplify generator expression.

CHANGES/5877.bugfix

@@ -0,0 +1 @@
+Uses :py:class:`~asyncio.ThreadedChildWatcher` under POSIX to allow setting up test loop in non-main thread.

CHANGES/5905.bugfix

@@ -0,0 +1 @@
+Removed the deprecated ``loop`` argument from the ``asyncio.sleep``/``gather`` calls

CHANGES/5914.misc

@@ -0,0 +1 @@
+Changed the SVG logos to be more optimized and the viewbox to 0 0 24 24, while keeping the same height and width -- :user:`ShadiestGoat`.

CHANGES/5927.feature

@@ -0,0 +1 @@
+Added support for Python 3.10 to Github Actions CI/CD workflows and fix the related deprecation warnings -- :user:`Hanaasagi`.

CHANGES/5930.feature

@@ -0,0 +1 @@
+Switched ``chardet`` to ``charset-normalizer`` for guessing the HTTP payload body encoding -- :user:`Ousret`.

CHANGES/5932.misc

@@ -0,0 +1 @@
+Enable auto-merging of Dependabot PRs.

CHANGES/5992.feature

@@ -0,0 +1,3 @@
+Added support for HTTPS proxies to the extent CPython's
+:py:mod:`asyncio` supports it -- by :user:`bmbouter`,
+:user:`jborean93` and :user:`webknjaz`.

CHANGES/6002.misc

@@ -0,0 +1,2 @@
+Implemented end-to-end testing of sending HTTP and HTTPS requests
+via ``proxy.py``.

CHANGES/6045.misc

@@ -0,0 +1,3 @@
+Added ``commit``, ``gh``, ``issue``, ``pr``
+and ``user`` RST roles in Sphinx
+-- :user:`webknjaz`.

CHANGES/6079.feature

@@ -0,0 +1 @@
+Add Trove classifier and create binary wheels for 3.10. -- :user:`hugovk`.