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

Author: connorjward

.github/workflows/core.yml

@@ -182,10 +182,6 @@ jobs:
           : # Empty the pip cache to ensure that everything is compiled from scratch
           pip cache purge
 
-          : # Fix for petsc4py+slepc4py build
-          echo 'setuptools<81' > constraints.txt
-          export PIP_CONSTRAINT=constraints.txt
-
           if [ ${{ inputs.target_branch }} = 'release' ]; then
             EXTRA_BUILD_ARGS=''
             EXTRA_PIP_FLAGS=''
@@ -440,10 +436,6 @@ jobs:
           : # Empty the pip cache to ensure that everything is compiled from scratch
           pip cache purge
 
-          : # Fix for petsc4py+slepc4py build
-          echo 'setuptools<81' > constraints.txt
-          export PIP_CONSTRAINT=constraints.txt
-
           if [ ${{ inputs.target_branch }} = 'release' ]; then
             EXTRA_PIP_FLAGS=''
           else

docker/Dockerfile.vanilla

@@ -36,14 +36,14 @@
 #     Extra arguments to pass to PETSc's `configure` script
 #
 # Example usage for a specific firedrake release with complex scalars:
-#  $ docker build \
+#  $ docker build . \
 #     --file=Dockerfile.vanilla \
 #     --tag=firedrake:2025.4.2-complex \
 #     --build-arg ARCH=complex \
 #     --build-arg BRANCH=2025.4.2
 #
 # Example usage for building from firedrake main with real scalars, ml installed with PETSc, and valgrind installed with apt:
-#  $ docker build \
+#  $ docker build . \
 #     --file=Dockerfile.vanilla \
 #     --tag=firedrake:main-latest \
 #     --build-arg ARCH=default \
@@ -136,28 +136,28 @@ ENV MPICC=mpicc
 ENV CFLAGS="-O3 -mtune=generic" CPPFLAGS="-O3 -mtune=generic"
 
 # Install Firedrake
-# - petsc4py and slepc4py are installed from source in PETSc repo.
-# - slepc4py is installed without build isolation so it links against
-#     the correct petsc4py version.
+# - If installing 'main' then petsc4py and slepc4py are installed from source,
+#   otherwise they are installed from PyPI. This mirrors our CI.
 # - Firedrake main branch requires main/master branch of some upstream
 #     packages. These are installed in editable mode.
 #     The order these are installed is important, e.g. FIAT must be installed
 #     before UFL otherwise `pip install fiat` will reinstall pypi ufl.
 
-# Fix for petsc4py+slepc4py build to be removed after #4873 is resolved.
-RUN echo 'setuptools<81' > /opt/constraints.txt
-ENV PIP_CONSTRAINT=/opt/constraints.txt
-
 RUN git clone --branch ${BRANCH} \
       https://github.com/firedrakeproject/firedrake.git /opt/firedrake \
-   && pip cache purge \
-   && pip install --verbose ${PETSC_DIR}/src/binding/petsc4py \
-   && pip install --verbose -r /opt/firedrake/requirements-build.txt \
-   && pip install --verbose --no-build-isolation \
-      ${SLEPC_DIR}/externalpackages/git.slepc/src/binding/slepc4py \
-   && pip install --verbose --no-binary h5py --no-build-isolation \
-      --editable '/opt/firedrake[docker]' || exit; \
-   if [ ${BRANCH} == "main" ]; then \
+    && pip cache purge || exit; \
+    if [ ${BRANCH} == "main" ]; then \
+      pip install --verbose ${PETSC_DIR}/src/binding/petsc4py \
+      && pip install --verbose -r /opt/firedrake/requirements-build.txt \
+      && pip install --verbose --no-build-isolation \
+           ${SLEPC_DIR}/externalpackages/git.slepc/src/binding/slepc4py \
+      && pip install --verbose --no-binary h5py --no-build-isolation \
+        --editable '/opt/firedrake[docker]' || exit; \
+    else \
+      pip install --verbose --no-binary h5py \
+        --editable '/opt/firedrake[docker]' || exit; \
+    fi; \
+    if [ ${BRANCH} == "main" ]; then \
       for pkg in \
          "git+https://github.com/dolfin-adjoint/pyadjoint.git#egg=pyadjoint-ad" \
          "git+https://github.com/firedrakeproject/fiat.git#egg=firedrake-fiat" \

docs/notebooks/11-extract-adjoint-solutions.ipynb

@@ -240,12 +240,6 @@ install Firedrake. To do this perform the following steps:
       so that it can be detected by mpi4py. See `here <https://mpi4py.readthedocs.io/en/stable/install.html#linux>`__
       for more information.
 
-#. Set ``PIP_CONSTRAINT`` to work around
-   `an issue with setuptools <https://gitlab.com/petsc/petsc/-/merge_requests/9016>`__::
-
-      $ echo 'setuptools<81' > constraints.txt
-      $ export PIP_CONSTRAINT=constraints.txt
-
 #. Install Firedrake::
 
       $ pip install --no-binary h5py 'firedrake[check]'

docs/source/install.rst

@@ -26,8 +26,7 @@ also be possible to join the tutorial using the cloud. Installing `Paraview <htt
 Registration
 ------------
 
-Registration of £25 covers tea, coffee, and biscuits. `Registration is now open on the Oxford online store <https://www.oxforduniversitystores.co.uk/product-catalogue/mathematical-institute/events/solving-partial-differential-equations-with-firedrake>`__.
-
+Registration of £25 covered tea, coffee, and biscuits. Registration closed on 6 March 2026.
 
 Where and when
 --------------
@@ -62,7 +61,7 @@ Thu Mar 19 (room L4)
 +-------------+-------------------------------------+
 | Time        | Session                             |
 +=============+=====================================+
-| 09:00-10:45 | Surface integrals. Nonlinearity     |
+| 09:00-10:45 | Boundaries. Nonlinearity            |
 +-------------+-------------------------------------+
 | 10:45-11:15 | Coffee break                        |
 +-------------+-------------------------------------+

docs/source/tutorial_mar_26.rst

@@ -12,6 +12,7 @@ import os
 import subprocess
 from argparse import ArgumentParser, RawDescriptionHelpFormatter
 import json
+import textwrap
 import time
 import requests
 import base64
@@ -791,13 +792,25 @@ def generate_unique_release_tag() -> str:
 def check_ref_exists(component):
     if "version" in shas[component]:
         # component is versioned, a GitHub release should already exist
-        if not release_already_exists(component, shas[component]["version"]):
-            log.error(
-                f"A release of {component} is referenced but no corresponding "
-                "release on GitHub can be found. For repositories we do not own "
-                "(e.g. PETSc) it will be necessary to push the release tags to "
-                "the Firedrake fork before making a release."
+        version = shas[component]["version"]
+        if not release_already_exists(component, version):
+            msg = textwrap.dedent(
+                f"""\
+                Release {shas[component]['version']} of {component} is
+                referenced but no corresponding release on GitHub can be
+                found. To fix this you have to update the fork and create the
+                release. Assuming that you have added the upstream repository
+                as a remote called 'upstream' the steps you have to follow are:
+
+                1. git fetch upstream
+                2. git push --tags
+                3. gh release create {version} --latest=false --prerelease --title {version} --repo firedrakeproject/{component}
+
+                Where 'gh' is the GitHub CLI tool.
+
+                """
             )
+            log.error(msg)
             sys.exit(1)
     else:
         repo = get_component_repository(component)
@@ -832,7 +845,7 @@ def make_github_release_or_tag_existing(component: str) -> None:
     if tag_existing_release:
         log.info(f"Commit '{commit_id}' found in a pre-existing release for "
                  f"'{component}', adding tag '{release_tag}' to it")
-        date = datetime.datetime.utcnow().replace(microsecond=0, tzinfo=datetime.timezone.utc).isoformat()
+        date = datetime.datetime.now(datetime.UTC).replace(microsecond=0, tzinfo=datetime.timezone.utc).isoformat()
         tagger = {"name": "firedrake-zenodo",
                   "email": "firedrake@imperial.ac.uk",
                   "date": date}
@@ -850,13 +863,38 @@ def make_github_release_or_tag_existing(component: str) -> None:
             "or any of its dependencies. Instead, refer to "
             "https://www.firedrakeproject.org/citing.html"
         )
-        repo.create_release(
-            tag_name=release_tag,
-            target_commitish=commit_id,
-            name=DESCRIPTIONS[component],
-            body=body,
-            draft=False,
-            prerelease=True)
+        try:
+            repo.create_release(
+                tag_name=release_tag,
+                target_commitish=commit_id,
+                name=DESCRIPTIONS[component],
+                body=body,
+                draft=False,
+                prerelease=True)
+        except github3.exceptions.NotFoundError:
+            # The GitHub API is buggy and this will occasionally fail
+            msg = textwrap.dedent(f"""\
+                Failed to create a release for {component}, this will have to
+                be done manually:
+
+                1. Tag the relevant commit:
+
+                    a. git clone git@github.com:firedrakeproject/{component}.git
+                    b. cd {component}
+                    c. git tag {release_tag} {commit_id}
+                    d. git push --tags
+
+                2. Make a prerelease on GitHub using this tag. The release name
+                   should be:
+
+                     '{DESCRIPTIONS[component]}'
+
+                   and the text should be:
+
+                   {body}
+
+                """)
+            log.error(msg)
 
 
 def make_releases() -> None:

firedrake/scripts/firedrake-zenodo

@@ -31,7 +31,7 @@ dependencies = [
   "numpy",
   "packaging",
   # TODO RELEASE
-  # "petsc4py==3.24.0",
+  # "petsc4py==3.24.5",
   "petsctools @ git+https://github.com/firedrakeproject/petsctools.git@main",
   "pkgconfig",
   "progress",
@@ -98,7 +98,7 @@ jax = [
 # ]
 # TODO RELEASE
 # slepc = [
-#   "slepc4py==3.24.0",
+#   "slepc4py==3.24.3",
 # ]
 torch = [  # requires passing '--extra-index-url' to work
   "torch",
@@ -127,7 +127,7 @@ ci = [
   "pytest-timeout",
   "pytest-xdist",
   # TODO RELEASE
-  # "slepc4py==3.24.0",
+  # "slepc4py==3.24.3",
   "torch",  # requires passing '--extra-index-url' to work
   "vtk",
 ]
@@ -147,7 +147,7 @@ docker = [  # Used in firedrake-vanilla container
   "pytest-timeout",
   "pytest-xdist",
   # TODO RELEASE
-  # "slepc4py==3.24.0",
+  # "slepc4py==3.24.3",
   "vtk",
 ]
 
@@ -159,7 +159,7 @@ requires = [
   "mpi4py; python_version < '3.13'",
   "numpy",
   # TODO RELEASE
-  # "petsc4py==3.24.0",
+  # "petsc4py==3.24.5",
   "petsctools",
   "pkgconfig",
   "pybind11",

pyproject.toml

@@ -39,7 +39,7 @@ ARCH_DEFAULT = FiredrakeArch.DEFAULT
 ARCH_COMPLEX = FiredrakeArch.COMPLEX
 
 
-SUPPORTED_PETSC_VERSION = "v3.24.0"
+SUPPORTED_PETSC_VERSION = "v3.24.5"
 
 
 def main():