.github/workflows/tox-{optional,experimental}.yml: Restore use of -maximal environments

Author: Matthias Koeppe

.github/workflows/tox-experimental.yml

@@ -106,54 +106,35 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        tox_system_factor: [homebrew-macos, conda-forge-macos]
-        tox_packages_factor: [minimal, standard]
+        tox_system_factor: [homebrew-macos, conda-forge-macos, homebrew-macos-python3_xcode]
+        tox_packages_factor: [maximal]
         # As of 2021-03, default xcode is 12.4
         # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
         xcode_version_factor: [default]
+        targets_pattern: [0-g, h-o, p, q-z]
         os: [ macos-10.15, macos-11.0 ]
         include:
           # Test xcode 11.7 only on macos-10.15
           - tox_system_factor: homebrew-macos
-            tox_packages_factor: minimal
+            tox_packages_factor: maximal
             xcode_version_factor: 11.7
+            targets_pattern: 0-g
             os: macos-10.15
           - tox_system_factor: homebrew-macos
-            tox_packages_factor: standard
+            tox_packages_factor: maximal
             xcode_version_factor: 11.7
+            targets_pattern: h-o
             os: macos-10.15
-          # python3_xcode is only accepted if enough packages are available from the system
-          # --> to test "minimal", we will need https://trac.sagemath.org/ticket/30949
-          - tox_system_factor: homebrew-macos-python3_xcode
-            tox_packages_factor: standard
+          - tox_system_factor: homebrew-macos
+            tox_packages_factor: maximal
             xcode_version_factor: 11.7
+            targets_pattern: p
             os: macos-10.15
-          - tox_system_factor: homebrew-macos-python3_xcode
-            tox_packages_factor: standard
-            xcode_version_factor: default
+          - tox_system_factor: homebrew-macos
+            tox_packages_factor: maximal
+            xcode_version_factor: 11.7
+            targets_pattern: q-z
             os: macos-10.15
-          - tox_system_factor: homebrew-macos-python3_xcode
-            tox_packages_factor: standard
-            xcode_version_factor: default
-            os: macos-11.0
-          - tox_system_factor: homebrew-macos-python3_xcode-nokegonly
-            tox_packages_factor: standard
-            xcode_version_factor: default
-            os: macos-11.0
-          # likewise for python3_pythonorg
-          - tox_system_factor: homebrew-macos-python3_pythonorg
-            tox_packages_factor: standard
-            xcode_version_factor: default
-            os: macos-11.0
-          # conda-forge-macos-environment
-          - tox_system_factor: conda-forge-macos
-            tox_packages_factor: environment
-            xcode_version_factor: default
-            os: macos-11.0
-          - tox_system_factor: conda-forge-macos
-            tox_packages_factor: environment-optional
-            xcode_version_factor: default
-            os: macos-11.0
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}

.github/workflows/tox-optional.yml

@@ -108,54 +108,35 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        tox_system_factor: [homebrew-macos, conda-forge-macos]
-        tox_packages_factor: [minimal, standard]
+        tox_system_factor: [homebrew-macos, conda-forge-macos, homebrew-macos-python3_xcode]
+        tox_packages_factor: [maximal]
         # As of 2021-03, default xcode is 12.4
         # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
         xcode_version_factor: [default]
+        targets_pattern: [0-g, h-o, p, q-z]
         os: [ macos-10.15, macos-11.0 ]
         include:
           # Test xcode 11.7 only on macos-10.15
           - tox_system_factor: homebrew-macos
-            tox_packages_factor: minimal
+            tox_packages_factor: maximal
             xcode_version_factor: 11.7
+            targets_pattern: 0-g
             os: macos-10.15
           - tox_system_factor: homebrew-macos
-            tox_packages_factor: standard
+            tox_packages_factor: maximal
             xcode_version_factor: 11.7
+            targets_pattern: h-o
             os: macos-10.15
-          # python3_xcode is only accepted if enough packages are available from the system
-          # --> to test "minimal", we will need https://trac.sagemath.org/ticket/30949
-          - tox_system_factor: homebrew-macos-python3_xcode
-            tox_packages_factor: standard
+          - tox_system_factor: homebrew-macos
+            tox_packages_factor: maximal
             xcode_version_factor: 11.7
+            targets_pattern: p
             os: macos-10.15
-          - tox_system_factor: homebrew-macos-python3_xcode
-            tox_packages_factor: standard
-            xcode_version_factor: default
+          - tox_system_factor: homebrew-macos
+            tox_packages_factor: maximal
+            xcode_version_factor: 11.7
+            targets_pattern: q-z
             os: macos-10.15
-          - tox_system_factor: homebrew-macos-python3_xcode
-            tox_packages_factor: standard
-            xcode_version_factor: default
-            os: macos-11.0
-          - tox_system_factor: homebrew-macos-python3_xcode-nokegonly
-            tox_packages_factor: standard
-            xcode_version_factor: default
-            os: macos-11.0
-          # likewise for python3_pythonorg
-          - tox_system_factor: homebrew-macos-python3_pythonorg
-            tox_packages_factor: standard
-            xcode_version_factor: default
-            os: macos-11.0
-          # conda-forge-macos-environment
-          - tox_system_factor: conda-forge-macos
-            tox_packages_factor: environment
-            xcode_version_factor: default
-            os: macos-11.0
-          - tox_system_factor: conda-forge-macos
-            tox_packages_factor: environment-optional
-            xcode_version_factor: default
-            os: macos-11.0
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}