From b983596ace0842230a442e10e49ffd4f27c34419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Schartum=20Dokken?= <jsd55@cam.ac.uk>
Date: Fri, 1 Jul 2022 12:17:59 +0100
Subject: [PATCH] Bump pyvista version (#2257)

As https://github.com/pyvista/pyvista/issues/2859 has been closed with  https://github.com/pyvista/pyvista/pull/2912 and vtk has added a python3.10 compatible pypi wheel (https://pypi.org/project/vtk/9.2.0rc1/) the codker file has been simplified
---
 .github/workflows/pyvista.yml | 3 ++-
 docker/Dockerfile             | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/pyvista.yml b/.github/workflows/pyvista.yml
index 87a45323ed1..175edce37fd 100644
--- a/.github/workflows/pyvista.yml
+++ b/.github/workflows/pyvista.yml
@@ -24,6 +24,7 @@ jobs:
       DISPLAY: ":99.0"
       PYVISTA_OFF_SCREEN: true
       PYVISTA_QT_VERSION: 0.9.0
+      PYVISTA_VERSION: 0.34.2
 
       PETSC_ARCH: linux-gnu-${{ matrix.petsc_arch }}-32
       OMPI_ALLOW_RUN_AS_ROOT: 1
@@ -49,7 +50,7 @@ jobs:
           apt-get update
           apt-get install -y --no-install-recommends libgl1-mesa-dev xvfb  # pyvista
           apt-get install -y --no-install-recommends python3-pyqt5 libgl1-mesa-glx  # pyvistaqt
-          pip3 install --find-links https://wheels.pyvista.org/ pyvista 
+          pip3 install pyvista==${PYVISTA_VERSION}
           pip3 install pyvistaqt==${PYVISTA_QT_VERSION}
           pip3 install matplotlib
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7171c0c8581..3e0ff553aa2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -51,7 +51,7 @@ ARG NUMPY_VERSION=1.22.4
 ARG PYBIND11_VERSION=2.9.2
 ARG PETSC_VERSION=3.17.2
 ARG SLEPC_VERSION=3.17.1
-# ARG PYVISTA_VERSION=0.34.1 # Deactivated until https://gitlab.kitware.com/vtk/vtk/-/issues/18335 is resolved
+ARG PYVISTA_VERSION=0.34.2
 ARG XTENSOR_VERSION=0.24.2
 ARG XTL_VERSION=0.7.4
 
@@ -470,7 +470,7 @@ ENV PKG_CONFIG_PATH=/usr/local/dolfinx-real/lib/pkgconfig:$PKG_CONFIG_PATH \
 FROM dolfinx as lab
 LABEL description="DOLFINx Jupyter Lab"
 
-# ARG PYVISTA_VERSION
+ARG PYVISTA_VERSION
 
 WORKDIR /root
 
@@ -486,8 +486,7 @@ RUN apt-get -qq update && \
 # matplotlib improves plotting quality with better color maps and properly rendering colorbars.
 RUN dpkgArch="$(dpkg --print-architecture)"; \
     case "$dpkgArch" in amd64) \
-    # pip3 install --no-cache-dir pyvista==${PYVISTA_VERSION} ;; \
-    pip3 install --find-links https://wheels.pyvista.org/ pyvista ;; \
+    pip3 install --no-cache-dir pyvista==${PYVISTA_VERSION} ;; \
     esac; \
     pip3 install --no-cache-dir matplotlib