From e73cf7e107026d80b176e9fb420b31cea964b730 Mon Sep 17 00:00:00 2001 From: Alessio Buccino Date: Wed, 13 Sep 2023 10:27:39 +0200 Subject: [PATCH] Simplify plexon2 tests (only run when dependencies are installed) --- .github/workflows/full-test-with-codecov.yml | 2 +- .github/workflows/full-test.yml | 5 +---- src/spikeinterface/extractors/tests/test_neoextractors.py | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/full-test-with-codecov.yml b/.github/workflows/full-test-with-codecov.yml index d0bf109a00..a5561c2ffc 100644 --- a/.github/workflows/full-test-with-codecov.yml +++ b/.github/workflows/full-test-with-codecov.yml @@ -54,7 +54,7 @@ jobs: - name: run tests run: | source ${{ github.workspace }}/test_env/bin/activate - pytest -m "not sorters_external and not plexon2" --cov=./ --cov-report xml:./coverage.xml -vv -ra --durations=0 | tee report_full.txt; test ${PIPESTATUS[0]} -eq 0 || exit 1 + pytest -m "not sorters_external" --cov=./ --cov-report xml:./coverage.xml -vv -ra --durations=0 | tee report_full.txt; test ${PIPESTATUS[0]} -eq 0 || exit 1 echo "# Timing profile of full tests" >> $GITHUB_STEP_SUMMARY python ./.github/build_job_summary.py report_full.txt >> $GITHUB_STEP_SUMMARY cat $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/full-test.yml b/.github/workflows/full-test.yml index a343500c08..8f88e84039 100644 --- a/.github/workflows/full-test.yml +++ b/.github/workflows/full-test.yml @@ -133,7 +133,7 @@ jobs: run: ./.github/run_tests.sh core - name: Test extractors if: ${{ steps.modules-changed.outputs.EXTRACTORS_CHANGED == 'true' || steps.modules-changed.outputs.CORE_CHANGED == 'true' }} - run: ./.github/run_tests.sh "extractors and not streaming_extractors and not plexon2" + run: ./.github/run_tests.sh "extractors and not streaming_extractors" - name: Test preprocessing if: ${{ steps.modules-changed.outputs.PREPROCESSING_CHANGED == 'true' || steps.modules-changed.outputs.CORE_CHANGED == 'true' }} run: ./.github/run_tests.sh preprocessing @@ -164,6 +164,3 @@ jobs: - name: Test internal sorters if: ${{ steps.modules-changed.outputs.SORTERS_INTERNAL_CHANGED == 'true' || steps.modules-changed.outputs.SORTINGCOMPONENTS_CHANGED || steps.modules-changed.outputs.CORE_CHANGED == 'true' }} run: ./.github/run_tests.sh sorters_internal - - name: Test plexon2 - if: ${{ steps.modules-changed.outputs.PLEXON2_CHANGED == 'true' }} - run: ./.github/run_tests.sh plexon2 diff --git a/src/spikeinterface/extractors/tests/test_neoextractors.py b/src/spikeinterface/extractors/tests/test_neoextractors.py index 5fe42b0c4e..ce2703d382 100644 --- a/src/spikeinterface/extractors/tests/test_neoextractors.py +++ b/src/spikeinterface/extractors/tests/test_neoextractors.py @@ -323,9 +323,8 @@ def test_pickling(self): pass -# We mark plexon2 tests as they require additional dependencies (wine) +# We run plexon2 tests only if we have dependencies (wine) @pytest.mark.skipif(not has_plexon2_dependencies(), reason="Required dependencies not installed") -@pytest.mark.plexon2 class Plexon2RecordingTest(RecordingCommonTestSuite, unittest.TestCase): ExtractorClass = Plexon2RecordingExtractor downloads = ["plexon"] @@ -335,7 +334,6 @@ class Plexon2RecordingTest(RecordingCommonTestSuite, unittest.TestCase): @pytest.mark.skipif(not has_plexon2_dependencies(), reason="Required dependencies not installed") -@pytest.mark.plexon2 class Plexon2EventTest(EventCommonTestSuite, unittest.TestCase): ExtractorClass = Plexon2EventExtractor downloads = ["plexon"] @@ -345,7 +343,6 @@ class Plexon2EventTest(EventCommonTestSuite, unittest.TestCase): @pytest.mark.skipif(not has_plexon2_dependencies(), reason="Required dependencies not installed") -@pytest.mark.plexon2 class Plexon2SortingTest(SortingCommonTestSuite, unittest.TestCase): ExtractorClass = Plexon2SortingExtractor downloads = ["plexon"]