From 10ddc8aaf2745954e5989bfe7eaef5fdc9ee5f77 Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Tue, 26 Nov 2024 13:03:09 -0500
Subject: [PATCH] MAINT: Unpin VTK

---
 azure-pipelines.yml               | 4 ++--
 tools/azure_dependencies.sh       | 2 +-
 tools/install_pre_requirements.sh | 7 +------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1719dd95354..a4958e61ad6 100644
--- 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
index b15cdaa7b89..92bd534e8a4 100755
--- a/tools/azure_dependencies.sh
+++ b/tools/azure_dependencies.sh
@@ -6,7 +6,7 @@ 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] "numpy<2"
 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
index 2577d47d34b..e9b6e3b46d5 100755
--- a/tools/install_pre_requirements.sh
+++ b/tools/install_pre_requirements.sh
@@ -45,12 +45,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"