From 5b11606d16ea7b40edf0293bbbbd8e97761f5a93 Mon Sep 17 00:00:00 2001
From: Sebastian Rittau <srittau@rittau.biz>
Date: Mon, 12 Oct 2020 15:01:09 +0200
Subject: [PATCH] CI: Update Python and mypy versions (#4656)

* Use 3.9 final instead of 3.9-dev
* Remove explicit Python versions from utility scripts
* Use mypy 0.390 for stubtests
---
 .github/workflows/stubtest-unused-whitelist.yml |  6 ++----
 .github/workflows/tests.yml                     | 16 ++--------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/stubtest-unused-whitelist.yml b/.github/workflows/stubtest-unused-whitelist.yml
index ef3f4118a..26bc6f383 100644
--- a/.github/workflows/stubtest-unused-whitelist.yml
+++ b/.github/workflows/stubtest-unused-whitelist.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest"]
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9-dev]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
       fail-fast: false
 
     steps:
@@ -24,7 +24,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install -U pip
-          pip install -U mypy==0.780
+          pip install -U mypy==0.790
       - name: Run stubtest
         shell: bash
         run: ./tests/stubtest_unused.py | tee stubtest-output-${{ matrix.os }}-${{ matrix.python-version }} || true
@@ -41,8 +41,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
       - name: Get stubtest outputs
         uses: actions/download-artifact@v2
         with:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 83a504c86..93aaf6b37 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,8 +11,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
       - run: ./tests/check_consistent.py
 
   flake8:
@@ -21,8 +19,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
       - run: |
           pip install $(grep flake8 requirements-tests-py3.txt)
           flake8
@@ -33,8 +29,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
       - run: |
           pip install $(grep black requirements-tests-py3.txt)
           black --check --diff stdlib third_party
@@ -45,8 +39,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
       - run: |
           pip install $(grep isort requirements-tests-py3.txt)
           isort --check-only --diff stdlib third_party
@@ -72,8 +64,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
       - run: pip install -U git+git://github.com/python/mypy
       - run: ./tests/mypy_test.py --platform=${{ matrix.platform }}
 
@@ -83,8 +73,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
       - run: ./tests/mypy_selftest.py
 
   stubtest:
@@ -93,7 +81,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest"]
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9-dev]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
       fail-fast: false
 
     steps:
@@ -105,6 +93,6 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install -U pip
-          pip install -U mypy==0.780
+          pip install -U mypy==0.790
       - name: Run stubtest
         run: python tests/stubtest_test.py --ignore-unused-whitelist