Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/actions/install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions docker/Dockerfile.vanilla
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
6 changes: 0 additions & 6 deletions docs/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -239,12 +239,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 Cython <https://gitlab.com/petsc/petsc/-/work_items/1929>`__::

$ echo 'Cython<3.3.0' > constraints.txt
$ export PIP_CONSTRAINT=$PWD/constraints.txt

#. Install Firedrake::

$ pip install --no-binary h5py 'firedrake[check]'
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"loopy>2024.1",
"numpy",
"packaging",
"petsc4py==3.25.0",
"petsc4py==3.25.5",
"petsctools>=2026.0",
"pkgconfig",
"progress",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion scripts/firedrake-configure
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
Loading