Skip to content

Commit 9d7832c

Browse files
authored
Merge pull request #3422 from h-mayorquin/add_macos_latest
Enable testing arm64 Mac architecture in the CI.
2 parents 57c4e2b + c3e5252 commit 9d7832c

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

.github/scripts/determine_testing_environment.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
sortingcomponents_changed = False
3232
generation_changed = False
3333
stream_extractors_changed = False
34+
github_actions_changed = False
3435

3536

3637
for changed_file in changed_files_in_the_pull_request_paths:
@@ -78,9 +79,12 @@
7879
sorters_internal_changed = True
7980
else:
8081
sorters_changed = True
82+
elif ".github" in changed_file.parts:
83+
if "workflows" in changed_file.parts:
84+
github_actions_changed = True
8185

8286

83-
run_everything = core_changed or pyproject_toml_changed or neobaseextractor_changed
87+
run_everything = core_changed or pyproject_toml_changed or neobaseextractor_changed or github_actions_changed
8488
run_generation_tests = run_everything or generation_changed
8589
run_extractor_tests = run_everything or extractors_changed or plexon2_changed
8690
run_preprocessing_tests = run_everything or preprocessing_changed
@@ -96,7 +100,7 @@
96100
run_sorters_test = run_everything or sorters_changed
97101
run_internal_sorters_test = run_everything or run_sortingcomponents_tests or sorters_internal_changed
98102

99-
run_streaming_extractors_test = stream_extractors_changed
103+
run_streaming_extractors_test = stream_extractors_changed or github_actions_changed
100104

101105
install_plexon_dependencies = plexon2_changed
102106

.github/workflows/all-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
python-version: ["3.9", "3.12"] # Lower and higher versions we support
29-
os: [macos-13, windows-latest, ubuntu-latest]
29+
os: [macos-latest, windows-latest, ubuntu-latest]
3030
steps:
3131
- uses: actions/checkout@v4
3232
- name: Setup Python ${{ matrix.python-version }}

src/spikeinterface/extractors/tests/test_neoextractors.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ class BlackrockSortingTest(SortingCommonTestSuite, unittest.TestCase):
234234
ExtractorClass = BlackrockSortingExtractor
235235
downloads = ["blackrock"]
236236
entities = [
237-
"blackrock/FileSpec2.3001.nev",
237+
dict(file_path=local_folder / "blackrock/FileSpec2.3001.nev", sampling_frequency=30_000.0),
238238
dict(file_path=local_folder / "blackrock/blackrock_2_1/l101210-001.nev", sampling_frequency=30_000.0),
239239
]
240240

@@ -278,8 +278,8 @@ class Spike2RecordingTest(RecordingCommonTestSuite, unittest.TestCase):
278278

279279

280280
@pytest.mark.skipif(
281-
version.parse(platform.python_version()) >= version.parse("3.10"),
282-
reason="Sonpy only testing with Python < 3.10!",
281+
version.parse(platform.python_version()) >= version.parse("3.10") or platform.system() == "Darwin",
282+
reason="Sonpy only testing with Python < 3.10 and not supported on macOS!",
283283
)
284284
class CedRecordingTest(RecordingCommonTestSuite, unittest.TestCase):
285285
ExtractorClass = CedRecordingExtractor
@@ -293,6 +293,7 @@ class CedRecordingTest(RecordingCommonTestSuite, unittest.TestCase):
293293
]
294294

295295

296+
@pytest.mark.skipif(platform.system() == "Darwin", reason="Maxwell plugin not supported on macOS")
296297
class MaxwellRecordingTest(RecordingCommonTestSuite, unittest.TestCase):
297298
ExtractorClass = MaxwellRecordingExtractor
298299
downloads = ["maxwell"]

0 commit comments

Comments
 (0)