From 1e7660760103b155028e56ad0730c73c0d942f68 Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Wed, 27 Nov 2024 12:26:14 +0100
Subject: [PATCH] Bump pyvista to deal with VTK 9.4 release (#2431)

* Bump pyvista to deal with VTK 9.4 release

* Prevent VTK 9.4 from being installed in minimum tests
---
 .github/workflows/tests.yaml | 4 ++--
 requirements/datasets.txt    | 2 +-
 requirements/min-reqs.old    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index a0f38b9815c..525223fc1f1 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -34,7 +34,7 @@ jobs:
           key: ${{ env.pythonLocation }}-${{ hashFiles('requirements/required.txt') }}-${{ hashFiles('requirements/datasets.txt') }}-${{ hashFiles('requirements/tests.txt') }}
         if: ${{ runner.os != 'macOS' }}
       - name: Setup headless display for pyvista
-        uses: pyvista/setup-headless-display-action@v2
+        uses: pyvista/setup-headless-display-action@v3
       - name: Install pip dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -67,7 +67,7 @@ jobs:
           path: ${{ env.pythonLocation }}
           key: ${{ env.pythonLocation }}-${{ hashFiles('requirements/min-reqs.old') }}
       - name: Setup headless display for pyvista
-        uses: pyvista/setup-headless-display-action@v2
+        uses: pyvista/setup-headless-display-action@v3
       - name: Install pip dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
diff --git a/requirements/datasets.txt b/requirements/datasets.txt
index b05a3c86894..336ab01fcf6 100644
--- a/requirements/datasets.txt
+++ b/requirements/datasets.txt
@@ -4,6 +4,6 @@ laspy==2.5.4
 opencv-python==4.10.0.84
 pandas[parquet]==2.2.3
 pycocotools==2.0.8
-pyvista==0.44.1
+pyvista==0.44.2
 scikit-image==0.24.0
 scipy==1.14.1
diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old
index c5a5f6dae58..a4a57e10968 100644
--- a/requirements/min-reqs.old
+++ b/requirements/min-reqs.old
@@ -30,6 +30,7 @@ pyarrow==15.0.0  # Remove when we upgrade min version of pandas to `pandas[parqu
 pyvista==0.34.2
 scikit-image==0.19.0
 scipy==1.7.2
+vtk==9.3.1  # PyVista is not yet compatible with VTK 9.4+
 
 # tests
 pytest==7.3.0