From 5acc659aa4c9a7a2fcbd0448421fcb2a3eb00298 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Fri, 11 Jun 2021 11:02:18 +0300
Subject: [PATCH 1/2] Update and simplify workflow

---
 .github/workflows/test.yml | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7408feba..212a7603 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,33 +4,24 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         python-version: [3.5, 3.6, 3.7, 3.8, 3.9, pypy3]
-        os: [ubuntu-18.04]
 
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Set up Python ${{ matrix.python }} (deadsnakes)
-        uses: deadsnakes/action@v1.0.0
-        if: endsWith(matrix.python-version, '-dev')
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Set up Python ${{ matrix.python-version }}
-        if: "!endsWith(matrix.python-version, '-dev')"
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Ubuntu cache
-        uses: actions/cache@v1
-        if: startsWith(matrix.os, 'ubuntu')
+      - name: Cache
+        uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           key:
@@ -47,12 +38,10 @@ jobs:
           python3 -m pip install ".[test]"
 
       - name: Tests
-        shell: bash
         run: |
           python -m testtools.run testtools.tests.test_suite
 
       - name: Docs
-        shell: bash
         run: |
           make clean-sphinx docs
 

From d767a36d29aadcae26840705afce0417a7db0ad5 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Fri, 11 Jun 2021 11:08:25 +0300
Subject: [PATCH 2/2] Add support for Python 3.9

---
 NEWS                | 3 +++
 scripts/all-pythons | 2 +-
 setup.cfg           | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index e80750c7..20dd229c 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,9 @@ NEXT
 Improvements
 ------------
 
+* Add support for Python 3.9.
+  (Hugo van Kemenade)
+
 * The skip, skipIf, and skipUnless decorators can now be used as class
   decorators as well as test method decorators, just as they can in
   unittest.
diff --git a/scripts/all-pythons b/scripts/all-pythons
index e131f6d0..6996a447 100755
--- a/scripts/all-pythons
+++ b/scripts/all-pythons
@@ -89,5 +89,5 @@ def now():
 if __name__ == '__main__':
     sys.path.append(ROOT)
     result = TestProtocolClient(sys.stdout)
-    for version in '3.5 3.6 3.7 3.8'.split():
+    for version in '3.5 3.6 3.7 3.8 3.9'.split():
         run_for_python(version, result, sys.argv[1:])
diff --git a/setup.cfg b/setup.cfg
index 87f67897..f252785b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,6 +16,7 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy