MAINT: Include OpenMEEG in pre jobs

larsoner · Mar 4, 2024 · 308fdec · 308fdec
1 parent 97b745a
commit 308fdec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/mne/conftest.py b/mne/conftest.py
@@ -902,6 +902,8 @@ def protect_config():
 
 
 def _test_passed(request):
+    if _phase_report_key not in request.node.stash:
+        return True
     report = request.node.stash[_phase_report_key]
     return "call" in report and report["call"].outcome == "passed"
 

diff --git a/tools/azure_dependencies.sh b/tools/azure_dependencies.sh
@@ -12,8 +12,8 @@ elif [ "${TEST_MODE}" == "pip-pre" ]; then
 	python -m pip install $STD_ARGS --only-binary ":all:" --default-timeout=60 --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "numpy<2.0.0.dev0" "scipy>=1.12.0.dev0" "scikit-learn>=1.5.dev0" matplotlib pillow statsmodels pyarrow h5py
 	# echo "dipy"
 	# python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://pypi.anaconda.org/scipy-wheels-nightly/simple" dipy
-	# echo "OpenMEEG"
-	# pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" openmeeg
+	echo "OpenMEEG"
+	pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" "openmeeg>=2.6.0.dev4"
 	echo "vtk"
 	python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://wheels.vtk.org" vtk
 	echo "nilearn"

diff --git a/tools/github_actions_dependencies.sh b/tools/github_actions_dependencies.sh
@@ -31,10 +31,10 @@ else
 	pip install $STD_ARGS --only-binary ":all:" --default-timeout=60 "PyQt6!=6.6.1,!=6.6.2" "PyQt6-Qt6!=6.6.1,!=6.6.2"
 	echo "NumPy/SciPy/pandas etc."
 	pip install $STD_ARGS --only-binary ":all:" --default-timeout=60 --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" "numpy<2.0.0.dev0" "scipy>=1.12.0.dev0" "scikit-learn>=1.5.dev0" matplotlib pillow statsmodels pyarrow pandas h5py
-	# No dipy, openmeeg, python-picard (needs numexpr) until they update to NumPy 2.0 compat
+	# No dipy, python-picard (needs numexpr) until they update to NumPy 2.0 compat
 	INSTALL_KIND="test_extra"
-	# echo "OpenMEEG"
-	# pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" openmeeg
+	echo "OpenMEEG"
+	pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" "openmeeg>=2.6.0.dev4"
 	# No Numba because it forces an old NumPy version
 	echo "nilearn"
 	pip install $STD_ARGS git+https://github.com/nilearn/nilearn