Merge pull request #3422 from h-mayorquin/add_macos_latest

Enable testing arm64 Mac architecture in the CI.
SpikeInterface · Sep 23, 2024 · 9d7832c · 9d7832c
2 parents 57c4e2b + c3e5252
commit 9d7832c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.github/scripts/determine_testing_environment.py b/.github/scripts/determine_testing_environment.py
@@ -31,6 +31,7 @@
 sortingcomponents_changed = False
 generation_changed = False
 stream_extractors_changed = False
+github_actions_changed = False
 
 
 for changed_file in changed_files_in_the_pull_request_paths:
@@ -78,9 +79,12 @@
             sorters_internal_changed = True
         else:
             sorters_changed = True
+    elif ".github" in changed_file.parts:
+        if "workflows" in changed_file.parts:
+            github_actions_changed = True
 
 
-run_everything = core_changed or pyproject_toml_changed or neobaseextractor_changed
+run_everything = core_changed or pyproject_toml_changed or neobaseextractor_changed or github_actions_changed
 run_generation_tests = run_everything or generation_changed
 run_extractor_tests = run_everything or extractors_changed or plexon2_changed
 run_preprocessing_tests = run_everything or preprocessing_changed
@@ -96,7 +100,7 @@
 run_sorters_test = run_everything or sorters_changed
 run_internal_sorters_test = run_everything or run_sortingcomponents_tests or sorters_internal_changed
 
-run_streaming_extractors_test = stream_extractors_changed
+run_streaming_extractors_test = stream_extractors_changed or github_actions_changed
 
 install_plexon_dependencies = plexon2_changed
 

diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml
@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.9", "3.12"]  # Lower and higher versions we support
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python ${{ matrix.python-version }}

diff --git a/src/spikeinterface/extractors/tests/test_neoextractors.py b/src/spikeinterface/extractors/tests/test_neoextractors.py
@@ -234,7 +234,7 @@ class BlackrockSortingTest(SortingCommonTestSuite, unittest.TestCase):
     ExtractorClass = BlackrockSortingExtractor
     downloads = ["blackrock"]
     entities = [
-        "blackrock/FileSpec2.3001.nev",
+        dict(file_path=local_folder / "blackrock/FileSpec2.3001.nev", sampling_frequency=30_000.0),
         dict(file_path=local_folder / "blackrock/blackrock_2_1/l101210-001.nev", sampling_frequency=30_000.0),
     ]
 
@@ -278,8 +278,8 @@ class Spike2RecordingTest(RecordingCommonTestSuite, unittest.TestCase):
 
 
 @pytest.mark.skipif(
-    version.parse(platform.python_version()) >= version.parse("3.10"),
-    reason="Sonpy only testing with Python < 3.10!",
+    version.parse(platform.python_version()) >= version.parse("3.10") or platform.system() == "Darwin",
+    reason="Sonpy only testing with Python < 3.10 and not supported on macOS!",
 )
 class CedRecordingTest(RecordingCommonTestSuite, unittest.TestCase):
     ExtractorClass = CedRecordingExtractor
@@ -293,6 +293,7 @@ class CedRecordingTest(RecordingCommonTestSuite, unittest.TestCase):
     ]
 
 
+@pytest.mark.skipif(platform.system() == "Darwin", reason="Maxwell plugin not supported on macOS")
 class MaxwellRecordingTest(RecordingCommonTestSuite, unittest.TestCase):
     ExtractorClass = MaxwellRecordingExtractor
     downloads = ["maxwell"]