ci: update CI config.

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
         # in all python versions and test failures (builtin_float) in 3.5<
         os: [ubuntu-18.04]
         backend: [c, cpp]
-        python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9, 3.10]
         env: [{}]
 
         include:
@@ -35,6 +35,20 @@ jobs:
 
           # Ubuntu sub-jobs:
           # ================
+          # Most recent
+          - os: ubuntu-20.04
+            python-version: 3.9
+            backend: c
+          - os: ubuntu-20.04
+            python-version: 3.9
+            backend: cpp
+          - os: ubuntu-20.04
+            python-version: 3.10
+            backend: c
+          - os: ubuntu-20.04
+            python-version: 3.10
+            backend: cpp
+
           # GCC 11
           - os: ubuntu-18.04
             python-version: 3.9
@@ -53,11 +67,6 @@ jobs:
             env: { TEST_CODE_STYLE: 1, NO_CYTHON_COMPILE: 1 }
             extra_hash: "-codestyle"
           # Limited API
-          - os: ubuntu-18.04
-            python-version: 3.6
-            backend: "c,cpp"
-            env: { LIMITED_API: "--limited-api", EXCLUDE: "--no-file" }
-            extra_hash: "-limited_api"
           - os: ubuntu-18.04
             python-version: 3.7
             backend: "c,cpp"
@@ -84,48 +93,19 @@ jobs:
             backend: c
             env: { EXTRA_CFLAGS: "-DCYTHON_USE_TYPE_SPECS=1" }
             extra_hash: "-typespecs"
-          - os: ubuntu-18.04
-            python-version: 3.6
-            backend: c
-            env: { EXTRA_CFLAGS: "-DCYTHON_USE_TYPE_SPECS=1" }
-            extra_hash: "-typespecs"
-          # Stackless
-          - os: ubuntu-18.04
-            python-version: 2.7
-            backend: c
-            env: { STACKLESS: true, PY: 2 }
-            extra_hash: "-stackless"
-          - os: ubuntu-18.04
-            python-version: 3.6
-            backend: c
-            env: { STACKLESS: true, PY: 3 }
-            extra_hash: "-stackless"
           # Pypy
-          - os: ubuntu-18.04
-            python-version: pypy-2.7
-            backend: c
-            env: { NO_CYTHON_COMPILE: 1 }
           - os: ubuntu-18.04
             python-version: pypy-3.7
             backend: c
             env: { NO_CYTHON_COMPILE: 1 }
           # Pypy [allowed-failures] - These specifically test known bugs
-          - os: ubuntu-18.04
-            python-version: pypy-2.7
-            backend: c
-            env:
-              {
-                NO_CYTHON_COMPILE: 1,
-                EXCLUDE: "--listfile=tests/pypy_bugs.txt --listfile=tests/pypy2_bugs.txt bugs",
-              }
-            allowed_failure: true
-            extra_hash: "-allowed_failures"
           - os: ubuntu-18.04
             python-version: pypy-3.7
             backend: c
             env: { NO_CYTHON_COMPILE: 1, EXCLUDE: "--listfile=tests/pypy_bugs.txt bugs" }
             allowed_failure: true
             extra_hash: "-allowed_failures"
+
           # Coverage - Disabled due to taking too long to run
           # - os: ubuntu-18.04
           #   python-version: 3.7
@@ -137,30 +117,34 @@ jobs:
           # ==============
           # (C-only builds are used to create wheels)
           - os: macos-10.15
-            python-version: 2.7
+            python-version: 3.7
             backend: c
             env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
           - os: macos-10.15
-            python-version: 2.7
-            backend: cpp
+            python-version: 3.8
+            backend: c
             env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
           - os: macos-10.15
-            python-version: 3.6
+            python-version: 3.9
             backend: c
             env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
           - os: macos-10.15
+            python-version: 3.9
+            backend: cpp
+            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
+          - os: macos-11
             python-version: 3.7
             backend: c
             env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
-          - os: macos-10.15
+          - os: macos-11
             python-version: 3.8
             backend: c
             env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
-          - os: macos-10.15
+          - os: macos-11
             python-version: 3.9
             backend: c
             env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
-          - os: macos-10.15
+          - os: macos-11
             python-version: 3.9
             backend: cpp
             env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }