Skip to content

Commit

Permalink
Bump pyvista version (#2257)
Browse files Browse the repository at this point in the history
As pyvista/pyvista#2859 has been closed with  pyvista/pyvista#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
  • Loading branch information
jorgensd committed Jul 1, 2022
1 parent eef67ee commit b983596
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/pyvista.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
7 changes: 3 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down

0 comments on commit b983596

Please sign in to comment.