Skip to content

Commit

Permalink
MAINT: Unpin VTK
Browse files Browse the repository at this point in the history
  • Loading branch information
larsoner committed Nov 26, 2024
1 parent 535b401 commit 10ddc8a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/azure_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
7 changes: 1 addition & 6 deletions tools/install_pre_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 10ddc8a

Please sign in to comment.