Merge pull request #4975 from firedrakeproject/connorjward/merge-release

Author: connorjward

.github/workflows/core.yml

@@ -504,6 +504,7 @@ jobs:
       - name: Install Firedrake
         id: install
         run: |
+          pip install --verbose -r ./firedrake-repo/requirements-build.txt
           CC=mpicc CXX=mpicxx \
             pip install --verbose --no-build-isolation './firedrake-repo[docs]'
           firedrake-clean

.github/workflows/docker_build.yml

@@ -82,6 +82,7 @@ jobs:
           build-args: |
             ARCH=${{ inputs.arch }}
             BRANCH=${{ inputs.branch }}
+            X86=1
           outputs: type=image,name=firedrakeproject/${{ inputs.target }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
@@ -138,6 +139,7 @@ jobs:
           build-args: |
             ARCH=${{ inputs.arch }}
             BRANCH=${{ inputs.branch }}
+            ARM64=1
           outputs: type=image,name=firedrakeproject/${{ inputs.target }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest

.github/workflows/push.yml

@@ -24,3 +24,51 @@ jobs:
       branch: ${{ github.ref_name }}
       build_dev: true
     secrets: inherit
+
+  colab:
+    name: Update Colab notebooks (release only)
+    if: github.ref_name == 'release'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+
+      - name: Install dependencies
+        run: pip install nbformat
+
+      - name: Checkout Firedrake
+        uses: actions/checkout@v5
+        with:
+          path: firedrake
+          ref: ${{ github.ref_name }}
+
+      - name: Checkout Colab notebooks
+        uses: actions/checkout@v5
+        with:
+          repository: firedrakeproject/notebooks
+          path: notebooks
+          token: ${{ secrets.NOTEBOOKS_REPO_TOKEN }}
+
+      - name: Copy notebooks
+        run: cp -r firedrake/docs/notebooks/* notebooks/
+
+      - name: Prepare notebooks for Colab
+        working-directory: notebooks
+        run: ./utils/firedrake-colab-notebooks ./*.ipynb
+
+      - name: Push changes if needed
+        working-directory: notebooks
+        run: |
+          if [ ! -z "$( git status --porcelain )" ]; then
+            echo "Changes detected"
+            git status
+            # Use the GitHub bot user account information
+            git config user.name "GitHub Actions"
+            git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+            git add --all .
+            git commit -m "Upstream updates"
+            git push
+          fi

.github/workflows/release.yml

@@ -72,50 +72,3 @@ jobs:
       tag: ${{ inputs.version }}
       branch: ${{ inputs.branch }}
     secrets: inherit
-
-  colab:
-    name: Update Colab notebooks
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.13'
-
-      - name: Install dependencies
-        run: pip install nbformat
-
-      - name: Checkout Firedrake
-        uses: actions/checkout@v5
-        with:
-          path: firedrake
-          ref: ${{ inputs.branch }}
-
-      - name: Checkout Colab notebooks
-        uses: actions/checkout@v5
-        with:
-          repository: firedrakeproject/notebooks
-          path: notebooks
-          token: ${{ secrets.NOTEBOOKS_REPO_TOKEN }}
-
-      - name: Copy notebooks
-        run: cp -r firedrake/docs/notebooks/* notebooks/
-
-      - name: Prepare notebooks for Colab
-        working-directory: notebooks
-        run: ./utils/firedrake-colab-notebooks ./*.ipynb
-
-      - name: Push changes if needed
-        working-directory: notebooks
-        run: |
-          if [ ! -z "$( git status --porcelain )" ]; then
-            echo "Changes detected"
-            git status
-            # Use the GitHub bot user account information
-            git config user.name "GitHub Actions"
-            git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-            git add --all .
-            git commit -m "Upstream updates"
-            git push
-          fi

demos/demo_references.bib

@@ -332,9 +332,12 @@ @article{Krishna:1997
 @article{BaierReinio:2025,
 	title={High-order finite element methods for three-dimensional multicomponent convection-diffusion},
   author={Baier-Reinio, Aaron and Farrell, Patrick E.},
-  journal={arXiv preprint arXiv:2408.17390},
-  year={2025},
-  doi={10.48550/arXiv.2408.17390}
+  journal={SIAM J. Sci. Comput.},
+  year={2026},
+  doi={10.1137/25M1734385},
+  number={2},
+  pages={A540--A567},
+  volume={48}
 }
 
 @article{VanBrunt:2025,

docker/Dockerfile.firedrake

@@ -2,16 +2,24 @@
 
 FROM firedrakeproject/firedrake-vanilla-default:latest
 
+# Architecture specific flags
+ARG X86
+ARG ARM64
+RUN \
+        if [ $(( "${X86:-0}" + "${ARM64:-0}" )) -ne 1 ]; then \
+                echo "Error: must set only one of 'X86' and 'ARM64'" \
+                && exit 1; \
+        fi
+
 # Install optional dependencies
 RUN pip install --verbose \
         --extra-index-url https://download.pytorch.org/whl/cpu \
         jax torch
 
 # Install ngsPETSc and dependencies. Netgen do not package ARM wheels so
-# we have to build it from source in that case. If on x86 then we have to
-# set PYTHONPATH so netgen can be found (see https://github.com/NGSolve/netgen/issues/213).
+# we have to build it from source in that case.
 RUN \
-        if [ "$(dpkg --print-architecture)" == "arm64" ]; then \
+        if [ "${ARM64:-0}" = "1" ]; then \
                 apt-get update \
                 && apt-get -y install python3-tk libxmu-dev tk-dev tcl-dev cmake g++ libglu1-mesa-dev liblapacke-dev libocct-data-exchange-dev libocct-draw-dev occt-misc libtbb-dev libxi-dev \
                 && rm -rf /var/lib/apt/lists/* \
@@ -23,14 +31,16 @@ RUN \
                 && cmake -DCMAKE="-cxx-flags=-flax-vector-conversions" -DCMAKE_INSTALL_PREFIX=/opt/ngsuite/netgen-install /opt/ngsuite/netgen-src \
                 && make \
                 && make install \
-                && export PATH=/opt/ngsuite/netgen-install/bin:$PATH \
-                && export PYTHONPATH=/opt/ngsuite/netgen-install/lib/python3.12/site-packages:$PYTHONPATH \
                 && pip install ngsPETSc --no-deps; \
         else \
-                export PYTHONPATH=/usr/local/lib/python3.12/site-packages:$PYTHONPATH \
-                && pip install ngsPETSc; \
+                pip install ngsPETSc; \
         fi
 
+# Set environment variables so that the netgen installation can be found
+# For x86 we have to set PYTHONPATH because of https://github.com/NGSolve/netgen/issues/213.
+ENV PATH=${ARM64:+/opt/ngsuite/netgen-install/bin:}$PATH
+ENV PYTHONPATH=${ARM64:+/opt/ngsuite/netgen-install/lib/python3.12/site-packages:}${X86:+/usr/local/lib/python3.12/site-packages:}$PYTHONPATH
+
 # Install some other niceties
 RUN apt-get update \
     && apt-get -y install graphviz graphviz-dev nano vim \

docs/source/conf.py

@@ -161,6 +161,7 @@
 
 # Dodgy links
 linkcheck_ignore = [
+    r'https://zenodo.org/.*',
     r'https://doi\.org/.*',
     r'https://epubs\.siam\.org/doi/.*',
     r'https://www\.apl\.washington\.edu/',

docs/source/tutorial_mar_26.rst

@@ -22,6 +22,7 @@ Attendees will need to bring a laptop. Installing Firedrake (see the
 :doc:`download page <install>` for details) is optional, as it will be
 also be possible to join the tutorial using the cloud. Installing `Paraview <https://www.paraview.org>`__ for visualisation before the course is recommended.
 
+The `lecture slides and demo codes are available on github <https://github.com/pefarrell/oxford2026>`__.
 
 Registration
 ------------