From c05c7948d11ad07a12089776c6eb17d494757deb Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <sda@fstab.net>
Date: Thu, 3 Dec 2020 18:42:53 -0500
Subject: [PATCH 1/6] Test against CPython 3.8 and 3.9

---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7917198d..dba226ee 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,6 +26,12 @@ jobs:
           - name: CPython 3.7
             tox: py37
             action: 3.7
+          - name: CPython 3.8
+            tox: py38
+            action: 3.8
+          - name: CPython 3.9
+            tox: py39
+            action: 3.9
         task:
           - name: Test
             tox: tests

From 8b4d736b3946d8f04bc91cf733fbc33ebc110ebb Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <sda@fstab.net>
Date: Thu, 3 Dec 2020 18:45:34 -0500
Subject: [PATCH 2/6] Test against PyPy 2 and 3

---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7917198d..2929125b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,6 +26,12 @@ jobs:
           - name: CPython 3.7
             tox: py37
             action: 3.7
+          - name: PyPy 2
+            tox: pypy2
+            action: pypy2
+          - name: PyPy 3
+            tox: pypy3
+            action: pypy3
         task:
           - name: Test
             tox: tests

From 6df19a583c1c81a6fdd85909dc0ae5d0d28b2c34 Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <sda@fstab.net>
Date: Thu, 3 Dec 2020 23:04:24 -0500
Subject: [PATCH 3/6] Add macOS to CI

---
 .github/workflows/ci.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7917198d..7c9cc4b5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,11 +8,16 @@ on:
 
 jobs:
   test:
-    name: ${{ matrix.task.name}} - ${{ matrix.python.name }}
-    runs-on: ubuntu-latest
+    name: ${{ matrix.task.name}} - ${{ matrix.os.name }} ${{ matrix.python.name }}
+    runs-on: ${{ matrix.os.runs-on }}
     strategy:
       fail-fast: false
       matrix:
+        os:
+          - name: Linux
+            runs-on: ubuntu-latest
+          - name: macOS
+            runs-on: macos-latest
         python:
           - name: CPython 2.7
             tox: py27
@@ -48,7 +53,7 @@ jobs:
 
     - name: Codecov
       run: |
-        codecov -n "GitHub Actions - ${{ matrix.task.name}} - ${{ matrix.python.name }}"
+        codecov -n "GitHub Actions - ${{ matrix.task.name}} - ${{ matrix.os.name }} ${{ matrix.python.name }}"
 
   check:
     name: ${{ matrix.task.name}} - ${{ matrix.python.name }}

From a6a504441ae2c05de7e45e700e3853a0a44e088d Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <sda@fstab.net>
Date: Sat, 5 Dec 2020 18:58:07 -0500
Subject: [PATCH 4/6] Add 291.misc.rst

---
 src/towncrier/newsfragments/291.misc.rst | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/towncrier/newsfragments/291.misc.rst

diff --git a/src/towncrier/newsfragments/291.misc.rst b/src/towncrier/newsfragments/291.misc.rst
new file mode 100644
index 00000000..e69de29b

From 5f4b02a806e3b8505c364a6ab750131bddff5c9c Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <sda@fstab.net>
Date: Sat, 5 Dec 2020 19:03:39 -0500
Subject: [PATCH 5/6] Switch to CPython 3.8 for checks

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c3fd9bc3..a8892c60 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,9 +74,9 @@ jobs:
       fail-fast: false
       matrix:
         python:
-          - name: CPython 3.6
-            tox: py36
-            action: 3.6
+          - name: CPython 3.8
+            tox: py38
+            action: 3.8
         task:
           - name: Flake8
             tox: flake8

From a00127fd6564e272c744d5a9825784bdc7d02448 Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <sda@fstab.net>
Date: Sat, 5 Dec 2020 17:38:57 -0800
Subject: [PATCH 6/6] Comment on use of second-most-recent minor release for
 checks

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a8892c60..caaf0034 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,6 +74,8 @@ jobs:
       fail-fast: false
       matrix:
         python:
+          # Using second most recent minor release for whatever little
+          # increase in stability over using the latest minor.
           - name: CPython 3.8
             tox: py38
             action: 3.8