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

Author: connorjward

.github/workflows/core.yml

@@ -673,15 +673,7 @@ jobs:
           firedrake-clean
           pip list
 
-      - name: Check bibtex
-        run: make -C firedrake-repo/docs validate-bibtex
-
-      - name: Check documentation links
-        if: success() || steps.install.conclusion == 'success'
-        run: make -C firedrake-repo/docs linkcheck
-
       - name: Build documentation
-        if: success() || steps.install.conclusion == 'success'
         id: build_docs
         working-directory: firedrake-repo/docs
         run: |
@@ -691,6 +683,14 @@ jobs:
           # : Copy manual to HTML tree
           cp build/latex/Firedrake.pdf build/html/_static/manual.pdf
 
+      - name: Check bibtex
+        if: success() || steps.install.conclusion == 'success'
+        run: make -C firedrake-repo/docs validate-bibtex
+
+      - name: Check documentation links
+        if: success() || steps.install.conclusion == 'success'
+        run: make -C firedrake-repo/docs linkcheck
+
       - name: Upload documentation
         uses: actions/upload-pages-artifact@v3
         id: upload_docs

docs/source/conf.py

@@ -184,6 +184,7 @@
     r'https://fluids.leeds.ac.uk/',
     r'https://www.ox.ac.uk',
     r'https://buy.crosscountrytrains.co.uk',
+    r'https://join.slack.com/t/firedrakeproject/*',
 ]
 linkcheck_timeout = 30
 
@@ -437,7 +438,7 @@
     'pyadjoint': ('https://pyadjoint.org/', None),
     'numpy': ('https://numpy.org/doc/stable/', None),
     'loopy': ('https://documen.tician.de/loopy/', None),
-    'torch': ('https://pytorch.org/docs/stable/', None),
+    'torch': ('https://pytorch.org/docs/main/', None),
     'jax': ('https://jax.readthedocs.io/en/latest/', None)
 }
 

docs/source/visualisation.rst

@@ -17,7 +17,7 @@ Creating output files
 
 Output for visualisation purposes is managed with a
 :class:`~.vtk_output.VTKFile` object. To create one, first import the
-class from `firedrake.output, then we just need to pass the name of the
+class from `firedrake.output`, then we just need to pass the name of the
 output file on disk. The file Firedrake creates is in PVD and
 therefore the requested file name must end in ``.pvd``.
 

tests/firedrake/demos/test_demos_run.py

@@ -20,7 +20,7 @@
 SERIAL_DEMOS = [
     Demo(("adaptive_multigrid", "adaptive_multigrid"), ["matplotlib", "netgen", "vtk"]),
     Demo(("benney_luke", "benney_luke"), ["vtk"]),
-    Demo(("boussinesq", "boussinesq"), []),
+    Demo(("boussinesq", "boussinesq"), ["netgen", "vtk"]),
     Demo(("burgers", "burgers"), ["vtk"]),
     Demo(("camassa-holm", "camassaholm"), ["vtk"]),
     Demo(("deflation", "deflation"), ["matplotlib"]),
@@ -38,7 +38,7 @@
     Demo(("matrix_free", "poisson"), []),
     Demo(("matrix_free", "rayleigh-benard"), ["hypre", "mumps", "vtk"]),
     Demo(("matrix_free", "stokes"), ["hypre", "mumps", "vtk"]),
-    Demo(("multicomponent", "multicomponent"), ["vtk, netgen"]),
+    Demo(("multicomponent", "multicomponent"), ["netgen", "vtk"]),
     Demo(("multigrid", "geometric_multigrid"), ["vtk"]),
     Demo(("netgen", "netgen_mesh"), ["mumps", "netgen", "slepc", "vtk"]),
     Demo(("nonlinear_QG_winddrivengyre", "qg_winddrivengyre"), ["vtk"]),