File tree Expand file tree Collapse file tree 5 files changed +8
-38
lines changed
Expand file tree Collapse file tree 5 files changed +8
-38
lines changed Original file line number Diff line number Diff line change @@ -169,10 +169,6 @@ jobs:
169169 python3 -m venv venv
170170 . venv/bin/activate
171171
172- : # Hotfix for petsc4py build, see https://gitlab.com/petsc/petsc/-/issues/1759
173- echo 'Cython<3.1' > constraints.txt
174- export PIP_CONSTRAINT=constraints.txt
175-
176172 : # Force a rebuild of petsc4py as the cached one will not link to the fresh
177173 : # install of PETSc.
178174 pip cache remove petsc4py
Original file line number Diff line number Diff line change @@ -183,21 +183,6 @@ install Firedrake. To do this perform the following steps:
183183 $ pip cache remove firedrake
184184 $ pip install --no-binary h5py 'firedrake[check]'
185185
186- .. warning::
187- The ``pip install`` instruction above does not currently work due to
188- `this issue <https://gitlab.com/petsc/petsc/-/issues/1759>`__. To fix it you should
189- first:
190-
191- 1. Run::
192-
193- $ echo 'Cython<3.1' > constraints.txt
194-
195- 2. Run::
196-
197- $ export PIP_CONSTRAINT=constraints.txt
198-
199- 3. Continue the installation as usual
200-
201186 .. note::
202187 Though not strictly necessary to install Firedrake's optional
203188 dependencies with ``[check]`` it is recommended because it allows you
@@ -555,21 +540,6 @@ should be followed:
555540
556541 $ pip install --no-build-isolation --no-binary h5py --editable './firedrake[check]'
557542
558- .. warning::
559- The ``pip install`` instruction above does not currently work due to
560- `this issue <https://gitlab.com/petsc/petsc/-/issues/1759>`__. To fix it you should
561- first:
562-
563- 1. Run::
564-
565- $ echo 'Cython<3.1' > constraints.txt
566-
567- 2. Run::
568-
569- $ export PIP_CONSTRAINT=constraints.txt
570-
571- 3. Continue the installation as usual
572-
573543
574544Editing subpackages
575545-------------------
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ dependencies = [
2424 " h5py>3.12.1" ,
2525 " libsupermesh" ,
2626 " loopy>2024.1" ,
27- " petsc4py==3.23.1 " ,
27+ " petsc4py==3.23.3 " ,
2828 " numpy" ,
2929 " packaging" ,
3030 " pkgconfig" ,
@@ -138,7 +138,7 @@ requires = [
138138 " pkgconfig" ,
139139 " pybind11" ,
140140 " setuptools>61.2" ,
141- " petsc4py==3.23.1 " ,
141+ " petsc4py==3.23.3 " ,
142142 " rtree>=1.2" ,
143143]
144144build-backend = " setuptools.build_meta"
Original file line number Diff line number Diff line change @@ -23,6 +23,7 @@ def main():
2323 check_firedrake_version ()
2424 check_min_python_version ()
2525 check_petsc_version ()
26+ check_slepc_version ()
2627 check_petsc_version_spec ()
2728
2829
@@ -58,9 +59,12 @@ def check_petsc_version() -> None:
5859 f"petsc4py=={ petsc_version } " ,
5960 2 ,
6061 )
62+
63+
64+ def check_slepc_version () -> None :
6165 check_file_contains_pattern (
6266 REPO_ROOT / "pyproject.toml" ,
63- f"slepc4py=={ petsc_version } " ,
67+ f"slepc4py==(.*) " ,
6468 3 ,
6569 )
6670
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ ARCH_DEFAULT = FiredrakeArch.DEFAULT
3939ARCH_COMPLEX = FiredrakeArch .COMPLEX
4040
4141
42- SUPPORTED_PETSC_VERSION = "v3.23.1 "
42+ SUPPORTED_PETSC_VERSION = "v3.23.3 "
4343
4444
4545def main ():
You can’t perform that action at this time.
0 commit comments