Add back Python 3.7 on macOS (#107)

Signed-off-by: Jean-Christophe Morin <[email protected]>
JeanChristopheMorinPerso · Apr 29, 2024 · 55c4f83 · 55c4f83
1 parent f3bd30f
commit 55c4f83
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -26,10 +26,20 @@ jobs:
 
     strategy:
       matrix:
-        python: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python: ['3.8', '3.9', '3.10', '3.11']
         # Ping macos to 13 so that we get intel CPUs.
         # TODO: Make our tests support arm64.
-        os: ['ubuntu-latest', 'windows-latest', 'macos-13']
+        os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
+        include:
+          # 3.7 is not available on Apple silicon.
+          # So manually add 3.7+macos13 and 3.7 on the other platforms.
+          # Note: The macos-13 image is the last macos image version on GHA to run on Intel CPUs.
+          - python: '3.7'
+            os: 'macos-13'
+          - python: '3.7'
+            os: 'windows-latest'
+          - python: '3.7'
+            os: 'ubuntu-latest'
       fail-fast: false
 
     steps:

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -191,7 +191,13 @@ def downloadPythonVersion(
         pytest.param(
             # Nuget doesn't have 3.7.16
             "3.7.9" if platform.system() == "Windows" else "3.7.16",
-            marks=pytest.mark.py37,
+            marks=[
+                pytest.mark.py3,
+                pytest.mark.skipif(
+                    platform.processor() == "arm" and platform.system() == "Darwin",
+                    reason="Python 3.7 is not compatible with Apple Silicon",
+                ),
+            ],
         ),
         pytest.param(
             # Nuget doesn't have 3.9.16