diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml index 40bcfee39b..54c1411d7f 100644 --- a/.github/actions/install/action.yml +++ b/.github/actions/install/action.yml @@ -135,10 +135,6 @@ runs: : # Empty the pip cache to ensure that everything is compiled from scratch pip cache purge - # Fix for petsc4py build to be removed after #5372 is resolved. - echo 'Cython<3.3.0' > constraints.txt - export PIP_CONSTRAINT=constraints.txt - if [ ${{ inputs.base_ref }} = 'main' ]; then : # Install build dependencies pip install "$PETSC_DIR"/src/binding/petsc4py @@ -154,7 +150,6 @@ runs: EXTRA_PIP_FLAGS='--no-build-isolation' elif [ ${{ inputs.base_ref }} = 'release' ]; then EXTRA_PIP_FLAGS='' - export PIP_BUILD_CONSTRAINT=constraints.txt else echo "Unrecognised 'base_ref' input: '${{ inputs.base_ref }}" exit 1 diff --git a/docker/Dockerfile.vanilla b/docker/Dockerfile.vanilla index 926b956217..ec9a9c16c9 100644 --- a/docker/Dockerfile.vanilla +++ b/docker/Dockerfile.vanilla @@ -143,10 +143,6 @@ ENV CFLAGS="-O3 -mtune=generic" CPPFLAGS="-O3 -mtune=generic" # 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 build to be removed after #5372 is resolved. -RUN echo 'Cython<3.3.0' > /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 || exit; \ diff --git a/docs/source/install.rst b/docs/source/install.rst index 5abe20065f..6f322c27c7 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -239,12 +239,6 @@ install Firedrake. To do this perform the following steps: so that it can be detected by mpi4py. See `here `__ for more information. -#. Set ``PIP_CONSTRAINT`` to work around - `an issue with Cython `__:: - - $ echo 'Cython<3.3.0' > constraints.txt - $ export PIP_CONSTRAINT=$PWD/constraints.txt - #. Install Firedrake:: $ pip install --no-binary h5py 'firedrake[check]' diff --git a/pyproject.toml b/pyproject.toml index 728683a7e2..705131d327 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ dependencies = [ "loopy>2024.1", "numpy", "packaging", - "petsc4py==3.25.0", + "petsc4py==3.25.5", "petsctools>=2026.0", "pkgconfig", "progress", @@ -158,7 +158,7 @@ requires = [ "mpi4py>3; python_version >= '3.13'", "mpi4py; python_version < '3.13'", "numpy", - "petsc4py==3.25.0", + "petsc4py==3.25.5", "petsctools", "pkgconfig", "pybind11", diff --git a/scripts/firedrake-configure b/scripts/firedrake-configure index b8ef8c4c79..78490d4bbc 100755 --- a/scripts/firedrake-configure +++ b/scripts/firedrake-configure @@ -58,7 +58,7 @@ from collections.abc import Mapping, Sequence # Attributes that we expect to change occasionally -SUPPORTED_PETSC_VERSION = "v3.25.0" +SUPPORTED_PETSC_VERSION = "v3.25.5" def main():