From 74a3f855e3f77ef301ba036d0c4b8884bcc3e555 Mon Sep 17 00:00:00 2001 From: Connor Ward Date: Tue, 26 Nov 2024 09:20:22 +0000 Subject: [PATCH] Do not specify numpy>=2 and tweak install instructions --- docs/source/download.rst | 7 +++---- pyproject.toml | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/source/download.rst b/docs/source/download.rst index 0ac65e6854..30c37e78b0 100644 --- a/docs/source/download.rst +++ b/docs/source/download.rst @@ -237,10 +237,11 @@ Firedrake has experimental support for installing using ``pip``, avoiding the ne Requirements ~~~~~~~~~~~~ +* An activated virtual environment. * All the system requirements listed in :ref:`system-requirements`. * A Firedrake-compatible PETSc installation (using our `fork of PETSc `_). The set of flags passed to PETSc can be retrieved by passing the command ``--show-petsc-configure-options`` to ``firedrake-install``. -* `libsupermesh `_ to be installed. -* The following environment variables to be set: +* `libsupermesh `_ to be installed inside the virtual environment (see `here `_ for an example of how to do this). +* The following environment variables to be set: * ``PETSC_DIR`` and ``PETSC_ARCH`` to point to the correct location for the PETSc installation. * ``HDF5_DIR`` to ``$PETSC_DIR/$PETSC_ARCH``. @@ -254,8 +255,6 @@ Having set up this environment, Firedrake can now be installed with the command: pip install --no-binary mpi4py,h5py git+https://github.com/firedrakeproject/firedrake.git -We recommend installing Firedrake in a Python virtual environment (venv). - Removing Firedrake ------------------ Firedrake and its dependencies can be removed by deleting the Firedrake diff --git a/pyproject.toml b/pyproject.toml index bfd66567e0..69af99a483 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ dependencies = [ "mpi4py", "h5py", "petsc4py", - "numpy>=2.0", + "numpy", "packaging", "pkgconfig", "progress", @@ -90,7 +90,7 @@ requires = [ "Cython>=3.0", "pybind11", "pkgconfig", - "numpy>=2.0", + "numpy", "mpi4py", "petsc4py", "rtree>=1.2",