Post merge fixups

Author: connorjward

firedrake/__init__.py

@@ -3,8 +3,7 @@
 # the specific version, here we are more permissive. This is to catch the
 # case where users don't update their PETSc for a really long time or
 # accidentally install a too-new release that isn't yet supported.
-# TODO RELEASE set to ">=3.25"
-PETSC_SUPPORTED_VERSIONS = ">=3.23.0"
+PETSC_SUPPORTED_VERSIONS = ">=3.25.0"
 
 
 def init_petsc():

pyproject.toml

@@ -2,7 +2,7 @@
 name = "firedrake"
 # <year>.<month>.<patch>
 # TODO RELEASE
-version = "2025.11.0.dev0"
+version = "2026.4.0.dev0"
 description = "An automated system for the portable solution of partial differential equations using the finite element method"
 readme = "README.rst"
 license = "LGPL-3.0-or-later"
@@ -30,13 +30,11 @@ dependencies = [
   "loopy>2024.1",
   "numpy",
   "packaging",
-  # TODO RELEASE
-  # "petsc4py==3.24.5",
+  "petsc4py==3.25.0",
   "petsctools @ git+https://github.com/firedrakeproject/petsctools.git@main",
   "pkgconfig",
   "progress",
-  # TODO RELEASE
-  "pyadjoint-ad @ git+https://github.com/dolfin-adjoint/pyadjoint@master",
+  "pyadjoint-ad>=2026.4.0",
   "pycparser",
   "pytools[siphash]",
   "requests",
@@ -70,8 +68,7 @@ pyop2-clean = "pyop2.compilation:clear_compiler_disk_cache"
 
 [project.optional-dependencies]
 check = [
-  # TODO RELEASE
-  "mpi-pytest @ git+https://github.com/firedrakeproject/mpi-pytest.git@main",
+  "mpi-pytest>=2026.0",
   "pytest",
 ]
 docs = [
@@ -92,14 +89,12 @@ docs = [
 jax = [
   "jax",
 ]
-# TODO RELEASE
-# netgen = [
-#   "ngsPETSc>=0.1.1",
-# ]
-# TODO RELEASE
-# slepc = [
-#   "slepc4py==3.24.3",
-# ]
+netgen = [
+  "ngsPETSc>=0.2.0",
+]
+slepc = [
+  "slepc4py==3.25.0",
+]
 torch = [  # requires passing '--extra-index-url' to work
   "torch",
 ]
@@ -112,12 +107,10 @@ ci = [
   "ipympl",  # needed for notebook testing
   "jax",
   "matplotlib",
-  # TODO RELEASE
-  "mpi-pytest @ git+https://github.com/firedrakeproject/mpi-pytest.git@main",
+  "mpi-pytest>=2026.0",
   "nbval",
   "networkx",
-  # TODO RELEASE
-  # "ngsPETSc>=0.1.1",
+  "ngsPETSc>=0.2.0",
   "pdf2image",
   "pygraphviz",
   "pylit",
@@ -126,16 +119,14 @@ ci = [
   "pytest-split",  # needed for firedrake-run-split-tests
   "pytest-timeout",
   "pytest-xdist",
-  # TODO RELEASE
-  # "slepc4py==3.24.3",
+  "slepc4py==3.25.0",
   "torch",  # requires passing '--extra-index-url' to work
   "vtk",
 ]
 docker = [  # Used in firedrake-vanilla container
   "ipympl",  # needed for notebook testing
   "matplotlib",
-  # TODO RELEASE
-  "mpi-pytest @ git+https://github.com/firedrakeproject/mpi-pytest.git@main",
+  "mpi-pytest>=2026.0",
   "nbval",
   "networkx",
   "pdf2image",
@@ -146,8 +137,7 @@ docker = [  # Used in firedrake-vanilla container
   "pytest-split",  # needed for firedrake-run-split-tests
   "pytest-timeout",
   "pytest-xdist",
-  # TODO RELEASE
-  # "slepc4py==3.24.3",
+  "slepc4py==3.25.0",
   "vtk",
 ]
 
@@ -158,8 +148,7 @@ requires = [
   "mpi4py>3; python_version >= '3.13'",
   "mpi4py; python_version < '3.13'",
   "numpy",
-  # TODO RELEASE
-  # "petsc4py==3.24.5",
+  "petsc4py==3.25.0",
   "petsctools",
   "pkgconfig",
   "pybind11",

scripts/firedrake-configure

@@ -48,7 +48,7 @@ ARCH_DEFAULT = FiredrakeArch.DEFAULT
 ARCH_COMPLEX = FiredrakeArch.COMPLEX
 
 
-SUPPORTED_PETSC_VERSION = "v3.24.5"
+SUPPORTED_PETSC_VERSION = "v3.25.0"
 # CUDA 13.1 is currently not supported by GPU drivers on Firedrake CI systems.
 SUPPORTED_CUDA_VERSION = "13.0"
 

setup.py

@@ -21,8 +21,7 @@
 
 
 # Ensure that the PETSc getting linked against is compatible
-# TODO RELEASE set to ">=3.25"
-petsctools.init(version_spec=">=3.23.0")
+petsctools.init(version_spec=">=3.25.0")
 import petsc4py