FIX: Simplify

Author: larsoner

tools/github_actions_dependencies.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -ef
 
-set -o pipefail
+set -eo pipefail
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 STD_ARGS="--progress-bar off --upgrade"
@@ -25,7 +25,7 @@ elif [[ "${MNE_CI_KIND}" == "pip" ]]; then
 else
 	test "${MNE_CI_KIND}" == "pip-pre"
 	STD_ARGS="$STD_ARGS --pre"
-	${SCRIPT_DIR}/install_pre_requirements.sh
+	${SCRIPT_DIR}/install_pre_requirements.sh || exit 1
 	INSTALL_KIND="test_extra"
 fi
 echo ""

tools/install_pre_requirements.sh

@@ -12,15 +12,20 @@ QT_BINDING="PySide6"
 # Dependencies of scientific-python-nightly-wheels are installed here so that
 # we can use strict --index-url (instead of --extra-index-url) below
 set -x
+echo "::group::Prerequisites"
 python -m pip install $STD_ARGS pip setuptools packaging \
 	threadpoolctl cycler fonttools kiwisolver pyparsing pillow python-dateutil \
 	patsy pytz tzdata nibabel tqdm trx-python joblib numexpr \
 	"$QT_BINDING!=6.9.1" \
 	py-cpuinfo blosc2 hatchling "formulaic>=1.1.0"
 python -m pip uninstall -yq numpy
+echo "::endgroup::"
+echo "::group::Scientific Python Nightly Wheels"
 python -m pip install $STD_ARGS --only-binary ":all:" --default-timeout=60 \
 	--index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" \
-	"numpy>=2.1.0.dev0" "scikit-learn>=1.6.dev0" "scipy>=1.15.0.dev0" \
+	"numpy>=2.1.0.dev0" \
+	"scipy>=1.15.0.dev0" \
+	"scikit-learn>=1.6.dev0" \
 	"matplotlib>=3.11.0.dev0" \
 	"pandas>=3.0.0.dev0" \
 	"dipy>=1.10.0.dev0" \
@@ -29,44 +34,37 @@ python -m pip install $STD_ARGS --only-binary ":all:" --default-timeout=60 \
 	"h5py>=3.13.0"
 # TODO: should have above: "statsmodels>=0.15.0.dev0"
 # https://github.com/statsmodels/statsmodels/issues/9572
+echo "::endgroup::"
 
 # No Numba because it forces an old NumPy version
 
-pip install https://gitlab.com/obob/pymatreader/-/archive/master/pymatreader-master.zip
-
-python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" "openmeeg>=2.6.0.dev4"
-
-python -m pip install $STD_ARGS "git+https://github.com/nilearn/nilearn"
-
+echo "::group::VTK"
 python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://wheels.vtk.org" vtk
 python -c "import vtk"
-
-python -m pip install $STD_ARGS "git+https://github.com/pyvista/pyvista" trame trame-vtk trame-vuetify jupyter ipyevents ipympl
-
-python -m pip install $STD_ARGS git+https://github.com/pierreablin/picard
-
-pip install $STD_ARGS git+https://github.com/pyvista/pyvistaqt
-
-pip install $STD_ARGS imageio-ffmpeg xlrd mffpy traitlets pybv eeglabio defusedxml antio
-
-pip install $STD_ARGS git+https://github.com/mne-tools/mne-qt-browser
-
-pip install $STD_ARGS git+https://github.com/mne-tools/mne-bids
-
-pip install $STD_ARGS git+https://github.com/nipy/nibabel
-
-pip install $STD_ARGS git+https://github.com/joblib/joblib
-
-# Disable protection for Azure, see
-# https://github.com/mne-tools/mne-python/pull/12609#issuecomment-2115639369
-GIT_CLONE_PROTECTION_ACTIVE=false pip install $STD_ARGS git+https://github.com/the-siesta-group/edfio
-
-pip install $STD_ARGS git+https://github.com/h5io/h5io
-
-pip install $STD_ARGS git+https://github.com/BUNPC/pysnirf2
-
-# Make sure we're on a NumPy 2.0 variant
+echo "::endgroup::"
+
+echo "::group::Everything else"
+python -m pip install $STD_ARGS \
+    "git+https://github.com/pyvista/pyvista" \
+	"git+https://github.com/pyvista/pyvistaqt" \
+	"git+https://github.com/nilearn/nilearn" \
+	"git+https://github.com/pierreablin/picard" \
+	https://gitlab.com/obob/pymatreader/-/archive/master/pymatreader-master.zip \
+    git+https://github.com/mne-tools/mne-qt-browser \
+    git+https://github.com/mne-tools/mne-bids \
+    git+https://github.com/nipy/nibabel \
+    git+https://github.com/joblib/joblib \
+	git+https://github.com/h5io/h5io \
+	git+https://github.com/BUNPC/pysnirf2 \
+	git+https://github.com/the-siesta-group/edfio \
+	trame trame-vtk trame-vuetify jupyter ipyevents ipympl openmeeg \
+	imageio-ffmpeg xlrd mffpy traitlets pybv eeglabio defusedxml antio
+echo "::endgroup::"
+
+echo "::group::Make sure we're on a NumPy 2.0 variant"
 python -c "import numpy as np; assert np.__version__[0] == '2', np.__version__"
+echo "::endgroup::"
 
-# And that Qt works
+echo "::group::Check Qt import"
 ${SCRIPT_DIR}/check_qt_import.sh "$QT_BINDING"
+echo "::endgroup::"