Small fixups

Author: connorjward

.github/workflows/core.yml

@@ -160,8 +160,8 @@ jobs:
             EXTRA_PIP_FLAGS=''
           else
             : # Install build dependencies
-            pip install -r ./firedrake-repo/requirements-dev.txt
             pip install "$PETSC_DIR"/src/binding/petsc4py
+            pip install -r ./firedrake-repo/requirements-build.txt
 
             : # Install runtime dependencies that have been removed from the pyproject.toml
             : # because they rely on non-PyPI versions of petsc4py.
@@ -445,8 +445,8 @@ jobs:
             EXTRA_PIP_FLAGS=''
           else
             : # Install build dependencies
-            pip install -r ./firedrake-repo/requirements-dev.txt
             pip install "$PETSC_DIR"/src/binding/petsc4py
+            pip install -r ./firedrake-repo/requirements-build.txt
 
             : # We have to pass '--no-build-isolation' to use a custom petsc4py
             EXTRA_PIP_FLAGS='--no-build-isolation'

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   deploy:
-    if: !startsWith(github.ref_name, 'Zenodo')
+    if: ! startsWith( github.ref_name, 'Zenodo' )
     uses: ./.github/workflows/core.yml
     with:
       target_branch: release
@@ -15,7 +15,7 @@ jobs:
     secrets: inherit
 
   docker:
-    if: !startsWith(github.ref_name, 'Zenodo')
+    if: ! startsWith( github.ref_name, 'Zenodo' )
     name: Build Docker containers
     uses: ./.github/workflows/docker.yml
     with:

docs/source/documentation.rst

@@ -9,17 +9,14 @@
       Firedrake is continually tested using `GitHub actions <https://docs.github.com/en/actions>`__.
 
       Latest Firedrake status: |firedrakebuild|_
-         .. |firedrakebuild| image:: https://github.com/firedrakeproject/firedrake/actions/workflows/pr.yml/badge.svg
-         .. _firedrakebuild: https://github.com/firedrakeproject/firedrake/actions/workflows/pr.yml
+         .. |firedrakebuild| image:: https://github.com/firedrakeproject/firedrake/actions/workflows/push.yml/badge.svg
+         .. _firedrakebuild: https://github.com/firedrakeproject/firedrake/actions/workflows/push.yml
 
       Firedrake and its components are developed on `GitHub
-      <http://github.com>`__ where we also maintain Firedrake-ready
-      versions of the `FEniCS <http://fenicsproject.org>`__ components
-      UFL.
+      <http://github.com>`__.
 
       * `Firedrake on GitHub <https://github.com/firedrakeproject/firedrake/>`__
       * `FIAT on GitHub <https://github.com/firedrakeproject/fiat>`__
-      * `Firedrake version of UFL on GitHub <https://github.com/firedrakeproject/ufl>`__
 
    Getting started
    ===============

docs/source/install.rst

@@ -190,12 +190,6 @@ install Firedrake. To do this perform the following steps:
 
 #. Firedrake is now installed and ready for use!
 
-.. warning::
-   Until Firedrake has versioned releases (slated for April/May 2025),
-   :doc:`firedrake-zenodo</zenodo>` will only work with *editable* installations of
-   Firedrake and its components. To install Firedrake in editable mode you
-   should follow the instructions :ref:`below<dev_install>`.
-
 
 .. _firedrake_check:
 

firedrake/scripts/firedrake-zenodo

@@ -407,7 +407,7 @@ The Firedrake components and dependencies used were:
 {links}
 </ul>
 </p>
-    """.format(title=title, links=links, doi=doi)
+    """.format(title=title, links=links)
     if additional_dois:
         data = """{data}
 
@@ -799,14 +799,8 @@ def check_ref_exists(component):
             sys.exit(1)
     else:
         repo = get_component_repository(component)
-        # I *think* that this will fail if it doesn't exist or clashes
-        debug = repo.commit("NOT A REAL COMMIT")
-        breakpoint()
         repo.commit(shas[component]["commit_id"])
 
-        # log.error(f"A release of {component} is referenced but no corresponding release on GitHub can be found, aborting")
-        # sys.exit(1)
-
 
 def make_github_release_or_tag_existing(component: str) -> None:
     repo = get_component_repository(component)

pyproject.toml

@@ -6,12 +6,12 @@ description = "An automated system for the portable solution of partial differen
 readme = "README.rst"
 license = {file = "LICENSE"}
 maintainers = [
-    {name = "Pablo D. Brubeck"},
-    {name = "Daiane I. Dolci"},
-    {name = "David A. Ham", email = "[email protected]"},
-    {name = "Josh Hope-Collins"},
-    {name = "Koki Sagiyama"},
-    {name = "Connor J. Ward", email = "[email protected]"},
+  {name = "Pablo D. Brubeck"},
+  {name = "Daiane I. Dolci"},
+  {name = "David A. Ham", email = "[email protected]"},
+  {name = "Josh Hope-Collins"},
+  {name = "Koki Sagiyama"},
+  {name = "Connor J. Ward", email = "[email protected]"},
 ]
 requires-python = ">=3.10"
 dependencies = [
@@ -90,7 +90,8 @@ jax = [
   "jax",
 ]
 netgen = [
-  "ngsPETSc",
+  # TODO RELEASE
+  # "ngsPETSc",
 ]
 slepc = [
   # TODO RELEASE
@@ -155,26 +156,26 @@ build-backend = "setuptools.build_meta"
 # TODO: Convert firedrake-zenodo to a proper entrypoint script.
 [tool.setuptools]
 script-files = [
-    "firedrake/scripts/firedrake-zenodo",
-    "scripts/firedrake-run-split-tests",
+  "firedrake/scripts/firedrake-zenodo",
+  "scripts/firedrake-run-split-tests",
 ]
 
 [tool.setuptools.package-data]
 # Unless specified these files will not be installed along with the
 # rest of the package
 firedrake = [
-    "evaluate.h",
-    "locate.c",
-    "icons/*.png",
+  "evaluate.h",
+  "locate.c",
+  "icons/*.png",
 ]
 firedrake_check = [
-    "Makefile",
-    "tests/firedrake/conftest.py",
-    "tests/*/*/*.py",
+  "Makefile",
+  "tests/firedrake/conftest.py",
+  "tests/*/*/*.py",
 ]
 pyop2 = [
-    "*.h",
-    "*.pxd",
-    "*.pyx",
-    "codegen/c/*.c",
+  "*.h",
+  "*.pxd",
+  "*.pyx",
+  "codegen/c/*.c",
 ]

requirements-dev.txt renamed to requirements-build.txt

@@ -1,4 +1,4 @@
-# core build dependencies (adapted from pyproject.toml)
+# Core build dependencies (adapted from pyproject.toml)
 Cython>=3.0
 libsupermesh
 mpi4py>3; python_version >= '3.13'
@@ -9,5 +9,5 @@ pybind11
 setuptools>61.2
 rtree>=1.2
 
-# transitive build dependencies
+# Transitive build dependencies
 hatchling