From be06518383f2dd82da71b7b56a27c13ad52ec90f Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Tue, 6 Oct 2020 17:28:42 +0300
Subject: [PATCH] GHA: Bump 3.9-dev to 3.9

---
 .ci/install.sh                     | 4 ++--
 .github/workflows/macos-install.sh | 4 ++--
 .github/workflows/test-windows.yml | 6 +++---
 .github/workflows/test.yml         | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.ci/install.sh b/.ci/install.sh
index 5baaded48..bbdb2013e 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -33,8 +33,8 @@ pip install pyroma
 pip install test-image-results
 pip install numpy
 
-# TODO Remove when 3.9-dev includes setuptools 49.3.2+:
-if [ "$GHA_PYTHON_VERSION" == "3.9-dev" ]; then pip install -U "setuptools>=49.3.2" ; fi
+# TODO Remove when 3.9 includes setuptools 49.3.2+:
+if [ "$GHA_PYTHON_VERSION" == "3.9" ]; then pip install -U "setuptools>=49.3.2" ; fi
 
 if [[ $TRAVIS_PYTHON_VERSION == 3.* ]]; then
   # arm64, ppc64le, s390x CPUs:
diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh
index a0418c3ba..eb7d40240 100755
--- a/.github/workflows/macos-install.sh
+++ b/.github/workflows/macos-install.sh
@@ -15,8 +15,8 @@ pip install test-image-results
 echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openblas/lib" >> ~/.numpy-site.cfg
 pip install numpy
 
-# TODO Remove when 3.9-dev includes setuptools 49.3.2+:
-if [ "$GHA_PYTHON_VERSION" == "3.9-dev" ]; then pip install -U "setuptools>=49.3.2" ; fi
+# TODO Remove when 3.9 includes setuptools 49.3.2+:
+if [ "$GHA_PYTHON_VERSION" == "3.9" ]; then pip install -U "setuptools>=49.3.2" ; fi
 
 # extra test images
 pushd depends && ./install_extra_test_images.sh && popd
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 190458e26..7536f64b1 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9-dev", "pypy3"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "pypy3"]
         architecture: ["x86", "x64"]
         include:
           - architecture: "x86"
@@ -63,9 +63,9 @@ jobs:
     - name: pip install wheel pytest pytest-cov
       run: python -m pip install wheel pytest pytest-cov
 
-    # TODO Remove when 3.9-dev includes setuptools 49.3.2+:
+    # TODO Remove when 3.9 includes setuptools 49.3.2+:
     - name: Upgrade setuptools
-      if: "contains(matrix.python-version, '3.9-dev')"
+      if: "contains(matrix.python-version, '3.9')"
       run: python -m pip install -U "setuptools>=49.3.2"
 
     - name: Install dependencies
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3f6f2ac51..6cb099640 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
         ]
         python-version: [
           "pypy3",
-          "3.9-dev",
+          "3.9",
           "3.8",
           "3.7",
           "3.6",