Fix tests:

* main branch no longer supports Python 3.6

Author: Michael Howitz

.github/workflows/test.yml

@@ -26,8 +26,8 @@ jobs:
           "3.7",
           "3.8",
           "3.9",
-          "3.10-dev",
-          "pypy3",
+          "3.10",
+          "pypy-3.7",
         ]
         pytest-version: [
           "5.3.*",
@@ -39,10 +39,12 @@ jobs:
         ]
         exclude:
           # Only pytest 6.2+ supports Python 3.10
-          - { python-version: "3.10-dev", pytest-version: "5.3.*" }
-          - { python-version: "3.10-dev", pytest-version: "5.4.*" }
-          - { python-version: "3.10-dev", pytest-version: "6.0.*" }
-          - { python-version: "3.10-dev", pytest-version: "6.1.*" }
+          - { python-version: "3.10", pytest-version: "5.3.*" }
+          - { python-version: "3.10", pytest-version: "5.4.*" }
+          - { python-version: "3.10", pytest-version: "6.0.*" }
+          - { python-version: "3.10", pytest-version: "6.1.*" }
+          # Main requires Python >= 3.7
+          - { python-version: "3.6", pytest-version: "main" }
     steps:
       - uses: actions/checkout@v2
 

tox.ini

@@ -11,7 +11,8 @@ max-line-length = 88
 [tox]
 envlist =
     linting
-    py{36,37,38,39,py3}-pytest{53,54,60,61,62,main}
+    py{36,37,38,39,py3}-pytest{53,54,60,61,62}
+    py{37,38,39,py3}-pytest{main}
     py310-pytest{62,main}
 minversion = 3.17.1