Merge remote-tracking branch 'origin/simon' into simon

.github/workflows/build_variants.yml

@@ -24,16 +24,16 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, 3.10]
+        python-version: [3.6, 3.7, 3.8, 3.9]
         os: [macos-10.15, macos-11.0, windows-latest]
         gcc_v: [ 10 ] # Version of GFortran we want to use.
         exclude:
-          - os: windows-latest
-            python-version: '3.6'
+#          - os: windows-latest
+#            python-version: '3.6'
           - os: macos-10.15
             python-version: '3.6'
-          - os: macos-10.15
-            python-version: '3.7'
+          - os: macos-11.0
+            python-version: '3.6'
 
     runs-on: ${{ matrix.os }}