Skip to content

Commit 308fdec

Browse files
committedMar 4, 2024
MAINT: Include OpenMEEG in pre jobs
1 parent 97b745a commit 308fdec

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed
 

‎mne/conftest.py

+2
Original file line numberDiff line numberDiff line change
@@ -902,6 +902,8 @@ def protect_config():
902902

903903

904904
def _test_passed(request):
905+
if _phase_report_key not in request.node.stash:
906+
return True
905907
report = request.node.stash[_phase_report_key]
906908
return "call" in report and report["call"].outcome == "passed"
907909

‎tools/azure_dependencies.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ elif [ "${TEST_MODE}" == "pip-pre" ]; then
1212
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
1313
# echo "dipy"
1414
# python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://pypi.anaconda.org/scipy-wheels-nightly/simple" dipy
15-
# echo "OpenMEEG"
16-
# pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" openmeeg
15+
echo "OpenMEEG"
16+
pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" "openmeeg>=2.6.0.dev4"
1717
echo "vtk"
1818
python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://wheels.vtk.org" vtk
1919
echo "nilearn"

‎tools/github_actions_dependencies.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ else
3131
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"
3232
echo "NumPy/SciPy/pandas etc."
3333
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
34-
# No dipy, openmeeg, python-picard (needs numexpr) until they update to NumPy 2.0 compat
34+
# No dipy, python-picard (needs numexpr) until they update to NumPy 2.0 compat
3535
INSTALL_KIND="test_extra"
36-
# echo "OpenMEEG"
37-
# pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" openmeeg
36+
echo "OpenMEEG"
37+
pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" "openmeeg>=2.6.0.dev4"
3838
# No Numba because it forces an old NumPy version
3939
echo "nilearn"
4040
pip install $STD_ARGS git+https://github.com/nilearn/nilearn

0 commit comments

Comments
 (0)