diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 629d212b..218a4f77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,6 +36,7 @@ jobs: channel-priority: "strict" envfile: ".github/environment-ci.yml" + ### NOTE: Coming soon when jams in mirdata is updated or removed #- os: ubuntu-latest # python-version: "3.12" # channel-priority: "strict" @@ -46,11 +47,6 @@ jobs: # channel-priority: "strict" # envfile: ".github/environment-ci.yml" - - os: macos-latest - python-version: "3.10" - channel-priority: "strict" - envfile: ".github/environment-ci.yml" - steps: - uses: actions/checkout@v3 with: diff --git a/tests/conftest.py b/tests/conftest.py index d92ba33a..9fb61c7f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -4,8 +4,6 @@ "tensorflow", "torch", "essentia", - "essentia_tensorflow", - "essentia_torch", "full_ml", "all", ] @@ -36,16 +34,6 @@ def skip_essentia(request): return request.config.getoption("--essentia") -@pytest.fixture(scope="session") -def skip_essentia_tensorflow(request): - return request.config.getoption("--essentia_tensorflow") - - -@pytest.fixture(scope="session") -def skip_essentia_torch(request): - return request.config.getoption("--essentia_torch") - - @pytest.fixture(scope="session") def skip_full_ml(request): return request.config.getoption("--full_ml") diff --git a/tests/melody/test_essentia_extractors.py b/tests/melody/test_essentia_extractors.py index e7e19ad4..ef75a61f 100644 --- a/tests/melody/test_essentia_extractors.py +++ b/tests/melody/test_essentia_extractors.py @@ -87,16 +87,6 @@ def test_ess_extractors_ess(): _predict_normalized_pitch() -@pytest.mark.essentia_tensorflow -def test_ess_extractors_ess_tf(): - _predict_normalized_pitch() - - -@pytest.mark.essentia_torch -def test_ess_extractors_ess_torch(): - _predict_normalized_pitch() - - @pytest.mark.all def test_ess_extractors_ess_all(): _predict_normalized_pitch() diff --git a/tests/melody/test_ftanet.py b/tests/melody/test_ftanet.py index 47aa5d64..e6780f8a 100644 --- a/tests/melody/test_ftanet.py +++ b/tests/melody/test_ftanet.py @@ -125,12 +125,6 @@ def test_predict_tf(): _predict_pitch() -@pytest.mark.essentia_tensorflow -def test_predict_ess_tf(): - _predict_pitch() - _predict_normalized_pitch() - - @pytest.mark.full_ml def test_predict_full(): _predict_pitch() diff --git a/tests/melody/test_ftaresnet.py b/tests/melody/test_ftaresnet.py index 892157b0..84624625 100644 --- a/tests/melody/test_ftaresnet.py +++ b/tests/melody/test_ftaresnet.py @@ -111,12 +111,6 @@ def test_predict_torch(): _predict_pitch() -@pytest.mark.essentia_torch -def test_predict_ess_torch(): - _predict_pitch() - _predict_normalized_pitch() - - @pytest.mark.full_ml def test_predict_full(): _predict_pitch() diff --git a/tests/separation/test_cold_diff_sep.py b/tests/separation/test_cold_diff_sep.py index 2d73ae69..e9ed807e 100644 --- a/tests/separation/test_cold_diff_sep.py +++ b/tests/separation/test_cold_diff_sep.py @@ -30,11 +30,6 @@ def test_predict_tf(): _separate() -@pytest.mark.essentia_tensorflow -def test_predict_ess_tf(): - _separate() - - @pytest.mark.full_ml def test_predict_full(): _separate() diff --git a/tests/structure/test_dhrupad_segmentation.py b/tests/structure/test_dhrupad_segmentation.py index 23ff6dae..bba139ea 100644 --- a/tests/structure/test_dhrupad_segmentation.py +++ b/tests/structure/test_dhrupad_segmentation.py @@ -48,11 +48,6 @@ def test_predict_tf(): _test_model() -@pytest.mark.essentia_torch -def test_predict_ess_tf(): - _test_model() - - @pytest.mark.full_ml def test_predict_full(): _test_model() diff --git a/tests/timbre/test_mridangam_stroke_classification.py b/tests/timbre/test_mridangam_stroke_classification.py index ad131cf5..9460bd00 100644 --- a/tests/timbre/test_mridangam_stroke_classification.py +++ b/tests/timbre/test_mridangam_stroke_classification.py @@ -64,16 +64,6 @@ def test_strokes_ess(): _predict_strokes() -@pytest.mark.essentia_tensorflow -def test_strokes_ess_tf(): - _predict_strokes() - - -@pytest.mark.essentia_torch -def test_strokes_ess_torch(): - _predict_strokes() - - @pytest.mark.all def test_strokes_ess_all(): _predict_strokes()