diff --git a/tools/azure_dependencies.sh b/tools/azure_dependencies.sh index abea6af8e86..8880e6478fa 100755 --- a/tools/azure_dependencies.sh +++ b/tools/azure_dependencies.sh @@ -9,9 +9,7 @@ if [ "${TEST_MODE}" == "pip" ]; then elif [ "${TEST_MODE}" == "pip-pre" ]; then ${SCRIPT_DIR}/install_pre_requirements.sh python -m pip install $STD_ARGS --pre -e .[test_extra] - echo "##vso[task.setvariable variable=MNE_TEST_ALLOW_SKIP].*(Requires (spm|brainstorm) dataset|Requires MNE-C|CUDA not|Numba not| on Windows|MNE_FORCE_SERIAL|PySide6 causes segfaults|neo).*" - # https://github.com/python-quantities/python-quantities/issues/262 - python -m pip uninstall -yq neo + echo "##vso[task.setvariable variable=MNE_TEST_ALLOW_SKIP].*(Requires (spm|brainstorm) dataset|Requires MNE-C|CUDA not|Numba not| on Windows|MNE_FORCE_SERIAL|PySide6 causes segfaults).*" else echo "Unknown run type ${TEST_MODE}" exit 1 diff --git a/tools/github_actions_dependencies.sh b/tools/github_actions_dependencies.sh index 985ed838915..4e7300cd40b 100755 --- a/tools/github_actions_dependencies.sh +++ b/tools/github_actions_dependencies.sh @@ -37,7 +37,3 @@ echo "" echo "::group::Installing test dependencies using pip" python -m pip install $STD_ARGS $INSTALL_ARGS .[$INSTALL_KIND] echo "::endgroup::" -if [[ "${MNE_CI_KIND}" == "pip-pre" ]]; then - # https://github.com/python-quantities/python-quantities/issues/262 - python -m pip uninstall -yq neo -fi diff --git a/tools/github_actions_env_vars.sh b/tools/github_actions_env_vars.sh index ed116873caf..9f424ae5f48 100755 --- a/tools/github_actions_env_vars.sh +++ b/tools/github_actions_env_vars.sh @@ -9,7 +9,7 @@ if [[ "$MNE_CI_KIND" == "pip"* ]]; then # We should test an eager import somewhere, might as well be here echo "EAGER_IMPORT=true" | tee -a $GITHUB_ENV # Make sure nothing unexpected is skipped - echo "MNE_TEST_ALLOW_SKIP=.*(Requires (spm|brainstorm) dataset|CUDA not|Numba not|PySide6 causes segfaults|neo).*" | tee -a $GITHUB_ENV + echo "MNE_TEST_ALLOW_SKIP=.*(Requires (spm|brainstorm) dataset|CUDA not|Numba not|PySide6 causes segfaults).*" | tee -a $GITHUB_ENV else echo "MNE_QT_BACKEND=PySide6" | tee -a $GITHUB_ENV fi diff --git a/tools/install_pre_requirements.sh b/tools/install_pre_requirements.sh index f996a35bdf2..84f4e27316f 100755 --- a/tools/install_pre_requirements.sh +++ b/tools/install_pre_requirements.sh @@ -54,6 +54,7 @@ python -m pip install $STD_ARGS \ "git+https://github.com/pyvista/pyvistaqt" \ "git+https://github.com/nilearn/nilearn" \ "git+https://github.com/pierreablin/picard" \ + "git+https://github.com/the-siesta-group/edfio" \ https://gitlab.com/obob/pymatreader/-/archive/master/pymatreader-master.zip \ git+https://github.com/mne-tools/mne-qt-browser \ git+https://github.com/pyqtgraph/pyqtgraph \ @@ -63,6 +64,7 @@ python -m pip install $STD_ARGS \ git+https://github.com/h5io/h5io \ git+https://github.com/BUNPC/pysnirf2 \ git+https://github.com/the-siesta-group/edfio \ + git+https://github.com/python-quantities/python-quantities \ trame trame-vtk trame-vuetify jupyter ipyevents ipympl openmeeg \ imageio-ffmpeg xlrd mffpy traitlets pybv eeglabio defusedxml \ antio