MAINT: Unpin VTK (mne-tools#12991)

withmywoessner · Nov 26, 2024 · e06873d · e06873d
1 parent 535b401
commit e06873d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 23 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -83,7 +83,7 @@ jobs:
           fetch-depth: 0
       - run: ./tools/github_actions_env_vars.sh
       # Xvfb/OpenGL
-      - uses: pyvista/setup-headless-display-action@main
+      - uses: pyvista/setup-headless-display-action@v3
         with:
           qt: true
           pyvista: false

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -263,8 +263,8 @@ stages:
             displayName: 'Get Python'
           - bash: |
               set -eo pipefail
-              git clone --depth 1 https://github.com/pyvista/gl-ci-helpers.git
-              powershell gl-ci-helpers/appveyor/install_opengl.ps1
+              git clone --depth 1 https://github.com/pyvista/setup-headless-display-action.git
+              bash setup-headless-display-action/windows/install_opengl.sh
             displayName: Install OpenGL
           - bash: ./tools/azure_dependencies.sh
             displayName: Install dependencies with pip

diff --git a/tools/azure_dependencies.sh b/tools/azure_dependencies.sh
@@ -5,8 +5,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 STD_ARGS="--progress-bar off --upgrade"
 python -m pip install $STD_ARGS pip setuptools wheel
 if [ "${TEST_MODE}" == "pip" ]; then
-	# TODO: numpy<2 because of https://github.com/dipy/dipy/issues/3265
-	python -m pip install $STD_ARGS --only-binary="numba,llvmlite,numpy,scipy,vtk,dipy" -e .[test,full] "numpy<2" "vtk<9.4"
+	python -m pip install $STD_ARGS --only-binary="numba,llvmlite,numpy,scipy,vtk,dipy" -e .[test,full]
 elif [ "${TEST_MODE}" == "pip-pre" ]; then
 	${SCRIPT_DIR}/install_pre_requirements.sh
 	python -m pip install $STD_ARGS --pre -e .[test_extra]

diff --git a/tools/install_pre_requirements.sh b/tools/install_pre_requirements.sh
@@ -14,27 +14,20 @@ QT_BINDING="PyQt6"
 echo "PyQt6 and scientific-python-nightly-wheels dependencies"
 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"
+	patsy pytz tzdata nibabel tqdm trx-python joblib numexpr "$QT_BINDING" \
+	py-cpuinfo blosc2
 echo "NumPy/SciPy/pandas etc."
 python -m pip uninstall -yq numpy
-# No pyarrow yet https://github.com/apache/arrow/issues/40216
-# No h5py (and thus dipy) yet until they improve/refactor thier wheel building infrastructure for Windows
-OTHERS=""
-if [[ "${PLATFORM}" == "Linux" ]]; then
-	OTHERS="h5py dipy"
-fi
 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" \
 	"statsmodels>=0.15.0.dev0" "pandas>=3.0.0.dev0" "matplotlib>=3.10.0.dev0" \
-	$OTHERS
+	"h5py>=3.12.1" "dipy>=1.10.0.dev0" "pyarrow>=19.0.0.dev0" "tables>=3.10.2.dev0"
 
 # No Numba because it forces an old NumPy version
 
-if [[ "${PLATFORM}" == "Linux" ]]; then
-	echo "pymatreader"
-	pip install https://gitlab.com/obob/pymatreader/-/archive/master/pymatreader-master.zip
-fi
+echo "pymatreader"
+pip install https://gitlab.com/obob/pymatreader/-/archive/master/pymatreader-master.zip
 
 echo "OpenMEEG"
 python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://test.pypi.org/simple" "openmeeg>=2.6.0.dev4"
@@ -45,12 +38,7 @@ echo "nilearn"
 python -m pip install $STD_ARGS "git+https://github.com/larsoner/nilearn@sklearn"
 
 echo "VTK"
-# No pre until PyVista fixes a bug
-if [[ "${PLATFORM}" == "Windows" ]]; then
-	python -m pip install $STD_ARGS "vtk<9.4"  # 9.4 requires GLSL 1.5 and Azure win only has 1.3
-else
-	python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://wheels.vtk.org" vtk
-fi
+python -m pip install $STD_ARGS --only-binary ":all:" --extra-index-url "https://wheels.vtk.org" vtk
 python -c "import vtk"
 
 echo "PyVista"