From 5e559679d28c4c86d8a89b334a0bf4843657d266 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Wed, 5 Feb 2025 10:16:21 -0500 Subject: [PATCH] FIX: Try --- .github/workflows/tests.yml | 5 +---- mne/conftest.py | 5 ----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 298908cdc65..40462bb3517 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -102,10 +102,7 @@ jobs: # Python (if conda) - name: Fixes for conda run: | - # For some reason on Linux we get crashes - if [[ "$RUNNER_OS" == "Linux" ]]; then - sed -i "/numba/d" environment.yml - elif [[ "$RUNNER_OS" == "macOS" ]]; then + if [[ "$RUNNER_OS" == "macOS" ]]; then sed -i "" "s/ - PySide6 .*/ - PySide6 <6.8/g" environment.yml fi if: matrix.kind == 'conda' || matrix.kind == 'mamba' diff --git a/mne/conftest.py b/mne/conftest.py index 2d57f2fb186..fabf9f93e5a 100644 --- a/mne/conftest.py +++ b/mne/conftest.py @@ -614,11 +614,6 @@ def renderer_pyvistaqt(request, options_3d, garbage_collect): @pytest.fixture(params=[pytest.param("notebook", marks=pytest.mark.pvtest)]) def renderer_notebook(request, options_3d): """Yield the 3D notebook renderer.""" - if ( - os.getenv("MNE_CI_KIND", "") in ("conda", "mamba") - and platform.system() == "Linux" - ): - pytest.skip("Skipping notebook tests on conda Linux CI") with _use_backend(request.param, interactive=False) as renderer: yield renderer