Bump version of base image and change pyvista backend

RangamaniLabUCSD · Jun 4, 2024 · 18247bd · 18247bd
1 parent 90e1548
commit 18247bd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml
@@ -14,15 +14,15 @@ on:
 jobs:
   build:
     runs-on: ubuntu-22.04
-    container: ghcr.io/scientificcomputing/fenics-gmsh:2024-02-19
+    container: ghcr.io/scientificcomputing/fenics-gmsh:2024-05-30
     env:
       DEB_PYTHON_INSTALL_LAYOUT: deb_system
       PUBLISH_DIR: ./_build/html
       DISPLAY: ":99.0"
       PYVISTA_TRAME_SERVER_PROXY_PREFIX: "/proxy/"
       PYVISTA_TRAME_SERVER_PROXY_ENABLED: "True"
-      PYVISTA_OFF_SCREEN: True
-      PYVISTA_JUPYTER_BACKEND: "panel"
+      PYVISTA_OFF_SCREEN: false
+      PYVISTA_JUPYTER_BACKEND: "html"
 
     steps:
       - name: Checkout

diff --git a/Dockerfile b/Dockerfile
@@ -1,17 +1,21 @@
-FROM ghcr.io/scientificcomputing/fenics-gmsh:2024-02-19 as smart_base
+FROM ghcr.io/scientificcomputing/fenics-gmsh:2024-05-30 as smart_base
 
-ENV PYVISTA_JUPYTER_BACKEND="panel"
+ENV PYVISTA_TRAME_SERVER_PROXY_PREFIX="/proxy/"
+ENV PYVISTA_TRAME_SERVER_PROXY_ENABLED="True"
+ENV PYVISTA_OFF_SCREEN=false
+ENV PYVISTA_JUPYTER_BACKEND="html"
 
 # Requirements for pyvista
 RUN apt-get update && apt-get install -y libgl1-mesa-glx libxrender1 xvfb nodejs
 
 COPY . /repo
 WORKDIR /repo
 
-RUN dpkgArch="$(dpkg --print-architecture)"; \
-    case "$dpkgArch" in arm64) \
-    python3 -m pip install "https://github.com/finsberg/vtk-aarch64/releases/download/vtk-9.2.6-cp310/vtk-9.2.6.dev0-cp310-cp310-linux_aarch64.whl" ;; \
-    esac;
+
+ARG TARGETPLATFORM
+RUN echo "Building for $TARGETPLATFORM"
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then python3 -m pip install "https://github.com/finsberg/vtk-aarch64/releases/download/vtk-9.2.6-cp310/vtk-9.2.6.dev0-cp310-cp310-linux_aarch64.whl"; fi
+
 RUN python3 -m pip install ".[test,examples,pyvista]"
 
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -35,7 +35,7 @@ test = ["pytest", "pytest-cov"]
 # which causes https://github.com/executablebooks/jupyter-book/issues/2063
 docs = ["jupyter-book==0.15.1", "sphinx-autoapi==2.0.1", "astroid<3"]
 examples = ["meshio", "gmsh", "matplotlib", "jupyter", "jupyterlab"]
-pyvista = ["pyvista==0.38.4", "panel"]
+pyvista = ["pyvista[all]>=0.43.0", "trame-vuetify", "ipywidgets",]
 
 all = [
     "fenics-smart[examples]",