From cedc5b7601a60ab311c2f252ed3decd15198f142 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Tue, 6 Oct 2020 19:48:59 +0300
Subject: [PATCH 1/3] Add support for Python 3.9

---
 .github/workflows/test.yml | 4 ++--
 setup.py                   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0cfd8d0..1fbcb07 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,14 +8,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.6", "3.7", "3.8"]
+        python-version: [ "3.6", "3.7", "3.8", "3.9"]
         os: [ubuntu-18.04, ubuntu-16.04, macos-latest, windows-2019]
         include:
           # PyPy3
           - { python-version: "pypy3", os: ubuntu-18.04 }
           - { python-version: "pypy3", os: ubuntu-16.04 }
           # Dev versions
-          - { python-version: "3.9-dev", os: ubuntu-18.04 }
+          - { python-version: "3.10-dev", os: ubuntu-18.04 }
 
     steps:
       - uses: actions/checkout@v2
diff --git a/setup.py b/setup.py
index 9c18309..3d571ff 100644
--- a/setup.py
+++ b/setup.py
@@ -11,6 +11,7 @@ Programming Language :: Python :: 3
 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
 """
 

From 62f63f14298bad44b0d7e0237eed58671398a14c Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Tue, 6 Oct 2020 20:01:22 +0300
Subject: [PATCH 2/3] Cannot test 3.10 yet: AssertionError: would build wheel
 with unsupported tag ('cp310', 'cp310', 'linux_x86_64')

---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1fbcb07..b161920 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,9 @@ jobs:
           - { python-version: "pypy3", os: ubuntu-18.04 }
           - { python-version: "pypy3", os: ubuntu-16.04 }
           # Dev versions
-          - { python-version: "3.10-dev", os: ubuntu-18.04 }
+          # 3.10-dev blocked by:
+          # AssertionError: would build wheel with unsupported tag ('cp310', 'cp310', 'linux_x86_64')
+          #- { python-version: "3.10-dev", os: ubuntu-18.04 }
 
     steps:
       - uses: actions/checkout@v2

From 72042ba023e381423c85bf6fb5eb53208df916ae Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Tue, 6 Oct 2020 20:03:18 +0300
Subject: [PATCH 3/3] Simplify config

---
 .github/workflows/lint.yml | 27 ++++++++++++++-------------
 .github/workflows/test.yml |  3 +--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 2e1fb36..33e3af2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -2,28 +2,27 @@ name: Lint
 
 on: [push, pull_request]
 
+env:
+  FORCE_COLOR: 1
+
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: pip cache
+      - name: Cache
         uses: actions/cache@v2
         with:
-          path: ~/.cache/pip
-          key: lint-pip-${{ hashFiles('**/setup.py') }}
+          path: |
+            ~/.cache/pip
+            ~/.cache/pre-commit
+          key:
+            lint-${{ hashFiles('**/setup.py') }}-${{
+            hashFiles('**/.pre-commit-config.yaml') }}
           restore-keys: |
-            lint-pip-
-
-      - name: pre-commit cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pre-commit
-          key: lint-pre-commit-v1-${{ hashFiles('**/.pre-commit-config.yaml') }}
-          restore-keys: |
-            lint-pre-commit-v1-
+            lint-
 
       - name: Set up Python
         uses: actions/setup-python@v2
@@ -37,3 +36,5 @@ jobs:
 
       - name: Lint
         run: pre-commit run --all-files
+        env:
+          PRE_COMMIT_COLOR: always
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b161920..26428c6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,10 +37,9 @@ jobs:
       - name: Get pip cache dir
         id: pip-cache
         run: |
-          python -m pip install -U "pip>=20.1"
           echo "::set-output name=dir::$(pip cache dir)"
 
-      - name: pip cache
+      - name: Cache
         uses: actions/cache@v2
         with:
           path: ${{ steps.pip-cache.outputs.dir }}