Merge branch 'master' of https://github.com/aio-libs/aiohttp into unc…

…losedssltransportwarning

# Conflicts:
#	CONTRIBUTORS.txt

.git-blame-ignore-revs

@@ -0,0 +1,28 @@
+# git hyper-blame master ignore list.
+#
+# This file contains a list of git hashes of revisions to be ignored by git
+# hyper-blame (in depot_tools). These revisions are considered "unimportant" in
+# that they are unlikely to be what you are interested in when blaming.
+#
+# Instructions:
+# - Only large (generally automated) reformatting or renaming CLs should be
+#   added to this list. Do not put things here just because you feel they are
+#   trivial or unimportant. If in doubt, do not put it on this list.
+# - Precede each revision with a comment containing the first line of its log.
+#   For bulk work over many commits, place all commits in a block with a single
+#   comment at the top describing the work done in those commits.
+# - Only put full 40-character hashes on this list (not short hashes or any
+#   other revision reference).
+# - Append to the bottom of the file (revisions should be in chronological order
+#   from oldest to newest).
+# - Because you must use a hash, you need to append to this list in a follow-up
+#   CL to the actual reformatting CL that you are trying to ignore.
+
+# Apply new hooks
+41c5467a62fb1041b77356ea22b81a74305941ef
+
+# Tune C source generation
+3f7d64798d46b8b166139811a377ba231b4f36bf
+
+# Apply pyupgrade
+32833c3fe081ff75c0b08ace9cc71e821a72fc5e

.gitattributes

@@ -1,3 +1,3 @@
-tests/sample.* binary
 tests/data.unknown_mime_type binary
 tests/hello.txt.gz binary
+tests/sample.* binary

.github/ISSUE_TEMPLATE.md

@@ -20,8 +20,8 @@
 
 <!-- Describe the environment you have that lead to your issue.
      This includes aiohttp version, OS, proxy server and other bits that
-     are related to your case. 
-     
+     are related to your case.
+
      IMPORTANT: aiohttp is both server framework and client library.
      For getting rid of confusing please put 'server', 'client' or 'both'
      word here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -20,4 +20,3 @@ assignees: aio-libs/triagers
 
 📋 **Additional context**
 <!-- Add any other context or screenshots about the feature request here. -->
-

.github/PULL_REQUEST_TEMPLATE.md

@@ -19,7 +19,7 @@
 - [ ] Documentation reflects the changes
 - [ ] If you provide code modification, please add yourself to `CONTRIBUTORS.txt`
   * The format is <Name> <Surname>.
-  * Please keep alphabetical order, the file is sorted by names. 
+  * Please keep alphabetical order, the file is sorted by names.
 - [ ] Add a new news fragment into the `CHANGES` folder
   * name it `<issue_id>.<type>` for example (588.bugfix)
   * if you don't have an `issue_id` change it to the pr id after creating the pr

.github/dependabot.yml

@@ -20,23 +20,23 @@ updates:
       interval: "daily"
     open-pull-requests-limit: 10
 
-  # Maintain dependencies for GitHub Actions aiohttp 3.7
+  # Maintain dependencies for GitHub Actions aiohttp 3.8
   - package-ecosystem: "github-actions"
     directory: "/"
     labels:
       - dependencies
       - autosquash
-    target-branch: "3.7"
+    target-branch: "3.8"
     schedule:
       interval: "daily"
 
-  # Maintain dependencies for Python aiohttp 3.7
+  # Maintain dependencies for Python aiohttp 3.8
   - package-ecosystem: "pip"
     directory: "/"
     labels:
       - dependencies
       - autosquash
-    target-branch: "3.7"
+    target-branch: "3.8"
     schedule:
       interval: "daily"
     open-pull-requests-limit: 10

.github/workflows/backport.yml

@@ -3,8 +3,15 @@ name: Backport
 #   pull_request_target:
 #     types: [opened, closed, labeled, unlabeled, synchronize]
 on:
+  # push:
+  #   branches:
+  #     - 'master'
+  #     - '[0-9].[0-9]+'  # matches to backport branches, e.g. 3.6
+  #   tags: [ 'v*' ]
   pull_request_target:
-    types: [opened, closed, labeled, unlabeled, synchronize]
+    types: [closed]
+  # pull_request_target:
+  #   types: [opened, closed, labeled, unlabeled, synchronize]
 
 jobs:
   backport:
@@ -13,18 +20,18 @@ jobs:
     # not awailable for forks, skip the workflow
     # if: ${{ github.event.pull_request.head.repo.full_name == 'aio-libs/aiohttp' }}
     steps:
-      # - id: generate_token
-      #   uses: tibdex/github-app-token@v1
-      #   with:
-      #     app_id: ${{ secrets.BOT_APP_ID }}
-      #     private_key: ${{ secrets.BOT_PRIVATE_KEY }}
+      - id: generate_token
+        uses: tibdex/github-app-token@v1
+        with:
+          app_id: ${{ secrets.BOT_APP_ID }}
+          private_key: ${{ secrets.BOT_PRIVATE_KEY }}
       - name: Backport
         uses: sqren/backport-github-action@v1
         with:
           # Required
           # Token to authenticate requests
-          # access_token: ${{ steps.generate_token.outputs.token }}
-          access_token: ${{ secrets.GITHUB_TOKEN }}
+          access_token: ${{ steps.generate_token.outputs.token }}
+          # access_token: ${{ secrets.GITHUB_TOKEN }}
 
           # Required
           # Backport PR by adding a label
@@ -43,7 +50,7 @@ jobs:
 
           # Optional
           # If no labels match the `backport_label_pattern` the backport check will fail. To bypass this for a single PR you can add a label to indicate the PR should not be backported
-          # skip_backport_check_label: 'backport:skip'
+          skip_backport_check_label: 'backport:skip'
 
           # Optional
           # If no labels match the `backport_label_pattern` the backport check will fail. Enabling this will bypass the check for all PRs

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
       with:
         python-version: 3.8
     - name: Cache PyPI
-      uses: actions/cache@v2
+      uses: actions/cache@v2.1.5
       with:
         key: pip-lint-${{ hashFiles('requirements/*.txt') }}
         path: ~/.cache/pip
@@ -41,7 +41,7 @@ jobs:
       with:
         path: requirements/lint.txt
     - name: Pre-Commit hooks
-      uses: pre-commit/action@v2.0.0
+      uses: pre-commit/action@v2.0.3
     - name: Install itself
       run: |
         python setup.py install
@@ -54,7 +54,6 @@ jobs:
       run: |
         sudo apt install libenchant-dev
         pip install -r requirements/doc-spelling.txt
-        pip install -r requirements/towncrier.txt
     - name: Run docs spelling
       run: |
         # towncrier --yes  # uncomment me after publishing a release
@@ -77,7 +76,7 @@ jobs:
     needs: lint
     strategy:
       matrix:
-        pyver: [3.6, 3.7, 3.8, 3.9]
+        pyver: [3.7, 3.8, 3.9]
         no-extensions: ['', 'Y']
         os: [ubuntu, macos, windows]
         exclude:
@@ -89,10 +88,11 @@ jobs:
             pyver: 3.8
           - os: windows
             no-extensions: 'Y'
-        include:
-          - pyver: pypy3
-            no-extensions: 'Y'
-            os: ubuntu
+        # pypy 3.7 exists in beta and doesn't work well yet
+        # include:
+        #   - pyver: pypy3
+        #     no-extensions: 'Y'
+        #     os: ubuntu
       fail-fast: true
     runs-on: ${{ matrix.os }}-latest
     timeout-minutes: 15
@@ -110,33 +110,22 @@ jobs:
       run: |
         echo "::set-output name=dir::$(pip cache dir)"    # - name: Cache
     - name: Cache PyPI
-      uses: actions/cache@v2
+      uses: actions/cache@v2.1.5
       with:
-        key: pip-ci-${{ runner.os }}-${{ matrix.pyver }}-{{ matrix.no-extensions }}-${{ hashFiles('requirements/*.txt') }}
+        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: Install cython
-      if: ${{ matrix.no-extensions == '' }}
-      uses: py-actions/py-dependency-install@v2
-      with:
-        path: requirements/cython.txt
+            pip-ci-${{ runner.os }}-${{ matrix.pyver }}-${{ matrix.no-extensions }}-
     - name: Cythonize
       if: ${{ matrix.no-extensions == '' }}
       run: |
         make cythonize
-    - name: Install dependencies
-      uses: py-actions/py-dependency-install@v2
-      with:
-        path: requirements/ci.txt
-      env:
-        AIOHTTP_NO_EXTENSIONS: ${{ matrix.no-extensions }}
     - name: Run unittests
       env:
         COLOR: 'yes'
         AIOHTTP_NO_EXTENSIONS: ${{ matrix.no-extensions }}
       run: |
-        python -m pytest tests -vv
+        make vvtest
         python -m coverage xml
     - name: Upload coverage
       uses: codecov/codecov-action@v1
@@ -169,10 +158,6 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.8
-    - name: Install cython
-      uses: py-actions/py-dependency-install@v2
-      with:
-        path: requirements/cython.txt
     - name: Cythonize
       run: |
         make cythonize
@@ -189,7 +174,7 @@ jobs:
     name: Linux
     strategy:
       matrix:
-        pyver: [cp36-cp36m, cp37-cp37m, cp38-cp38, cp39-cp39]
+        pyver: [cp37-cp37m, cp38-cp38, cp39-cp39]
         arch: [x86_64, aarch64, i686, ppc64le, s390x]
       fail-fast: false
     runs-on: ubuntu-latest
@@ -211,11 +196,6 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.8
-    - name: Install cython
-      if: ${{ matrix.no-extensions == '' }}
-      uses: py-actions/py-dependency-install@v2
-      with:
-        path: requirements/cython.txt
     - name: Cythonize
       if: ${{ matrix.no-extensions == '' }}
       run: |
@@ -242,8 +222,12 @@ jobs:
     name: Binary wheels
     strategy:
       matrix:
-        pyver: [3.6, 3.7, 3.8, 3.9]
+        pyver: [3.7, 3.8, 3.9]
         os: [macos, windows]
+        arch: [x86, x64]
+        exclude:
+        - os: macos
+          arch: x86
       fail-fast: false
     runs-on: ${{ matrix.os }}-latest
     needs: pre-deploy
@@ -256,11 +240,7 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.pyver }}
-    - name: Install cython
-      if: ${{ matrix.no-extensions == '' }}
-      uses: py-actions/py-dependency-install@v2
-      with:
-        path: requirements/cython.txt
+        architecture: ${{ matrix.arch }}
     - name: Cythonize
       if: ${{ matrix.no-extensions == '' }}
       run: |

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

@@ -0,0 +1,36 @@
+name: Pre-commit auto-update
+on:
+  schedule:
+  - cron: '0 0 * * *'
+jobs:
+  auto-update:
+    if: github.repository_owner == 'aiohttp'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Install dependencies
+      uses: py-actions/py-dependency-install@v2
+      with:
+        path: requirements/lint.txt
+    - name: Run pre-commit autoupdate
+      run: pre-commit autoupdate
+    - id: generate_token
+      uses: tibdex/github-app-token@v1
+      with:
+        app_id: ${{ secrets.BOT_APP_ID }}
+        private_key: ${{ secrets.BOT_PRIVATE_KEY }}
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v3.8.2
+      with:
+        token: ${{ steps.generate_token.outputs.token }}
+        branch: update/pre-commit-autoupdate
+        title: Auto-update pre-commit hooks
+        commit-message: Auto-update pre-commit hooks
+        body: |
+          Update versions of tools in pre-commit
+          configs to latest version
+        labels: dependencies backport-3.7 backport-3.8