summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarth N. Wells <gnw20@cam.ac.uk>2024-10-15 16:38:18 +0100
committerGitHub <noreply@github.com>2024-10-15 17:38:18 +0200
commitfc79c37e2d6b1a091415e5d279b65027d3793bd6 (patch)
tree79a0922cc53f2ebeaad22e48661cc9c090be5381
parent1d76ed7aa4acebcd4201d84523143cae9e65f29e (diff)
downloadspack-fc79c37e2d6b1a091415e5d279b65027d3793bd6.tar.gz
spack-fc79c37e2d6b1a091415e5d279b65027d3793bd6.tar.bz2
spack-fc79c37e2d6b1a091415e5d279b65027d3793bd6.tar.xz
spack-fc79c37e2d6b1a091415e5d279b65027d3793bd6.zip
(py-)fenics-dolfinx: add v0.9.0 (#46987)
* Update fenics-dolfinx to v0.9 * py-fenics-dolfinx update to v0.9 * Small updates * Small fix
-rw-r--r--var/spack/repos/builtin/packages/fenics-dolfinx/package.py9
-rw-r--r--var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py14
2 files changed, 18 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
index ba871cd731..b252d5a9c9 100644
--- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
+++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
@@ -17,6 +17,7 @@ class FenicsDolfinx(CMakePackage):
license("LGPL-3.0-or-later")
version("main", branch="main")
+ version("0.9.0", sha256="b266c74360c2590c5745d74768c04568c965b44739becca4cd6b5aa58cdbbbd1")
version("0.8.0", sha256="acf3104d9ecc0380677a6faf69eabfafc58d0cce43f7777e1307b95701c7cad9")
version("0.7.2", sha256="7d9ce1338ce66580593b376327f23ac464a4ce89ef63c105efc1a38e5eae5c0b")
version("0.6.0", sha256="eb8ac2bb2f032b0d393977993e1ab6b4101a84d54023a67206e3eac1a8d79b80")
@@ -40,7 +41,8 @@ class FenicsDolfinx(CMakePackage):
variant("slepc", default=False, description="slepc support")
variant("adios2", default=False, description="adios2 support")
- depends_on("cmake@3.19:", type="build")
+ depends_on("cmake@3.21:", when="@0.9:", type="build")
+ depends_on("cmake@3.19:", when="@:0.8", type="build")
depends_on("pkgconfig", type="build")
depends_on("mpi")
depends_on("hdf5+mpi")
@@ -49,16 +51,19 @@ class FenicsDolfinx(CMakePackage):
depends_on("spdlog", when="@0.9:")
depends_on("petsc+mpi+shared")
-
depends_on("slepc", when="+slepc")
+
+ depends_on("adios2@2.8.1:+mpi", when="@0.9: +adios2")
depends_on("adios2+mpi", when="+adios2")
depends_on("fenics-ufcx@main", when="@main")
+ depends_on("fenics-ufcx@0.9", when="@0.9")
depends_on("fenics-ufcx@0.8", when="@0.8")
depends_on("fenics-ufcx@0.7", when="@0.7")
depends_on("fenics-ufcx@0.6", when="@0.6")
depends_on("fenics-basix@main", when="@main")
+ depends_on("fenics-basix@0.9", when="@0.9")
depends_on("fenics-basix@0.8", when="@0.8")
depends_on("fenics-basix@0.7", when="@0.7")
depends_on("fenics-basix@0.6", when="@0.6")
diff --git a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
index 97ce274173..7ccfd32ddb 100644
--- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
@@ -18,13 +18,15 @@ class PyFenicsDolfinx(PythonPackage):
license("LGPL-3.0-only")
version("main", branch="main")
+ version("0.9.0", sha256="b266c74360c2590c5745d74768c04568c965b44739becca4cd6b5aa58cdbbbd1")
version("0.8.0", sha256="acf3104d9ecc0380677a6faf69eabfafc58d0cce43f7777e1307b95701c7cad9")
version("0.7.2", sha256="7d9ce1338ce66580593b376327f23ac464a4ce89ef63c105efc1a38e5eae5c0b")
version("0.6.0", sha256="eb8ac2bb2f032b0d393977993e1ab6b4101a84d54023a67206e3eac1a8d79b80")
depends_on("cxx", type="build") # generated
- depends_on("cmake@3.19:", type="build")
+ depends_on("cmake@3.21:", when="@0.9:", type="build")
+ depends_on("cmake@3.19:", when="@:0.8", type="build")
depends_on("hdf5", type="build")
depends_on("pkgconfig", type="build")
@@ -33,24 +35,29 @@ class PyFenicsDolfinx(PythonPackage):
depends_on("python@3.8:3.10", when="@0.6.0", type=("build", "run"))
depends_on("fenics-dolfinx@main", when="@main")
+ depends_on("fenics-dolfinx@0.9.0", when="@0.9.0")
depends_on("fenics-dolfinx@0.8.0", when="@0.8.0")
depends_on("fenics-dolfinx@0.7.2", when="@0.7.2")
depends_on("fenics-dolfinx@0.6.0", when="@0.6.0")
depends_on("py-fenics-basix@main", type=("build", "run"), when="@main")
+ depends_on("py-fenics-basix@0.9", type=("build", "link"), when="@0.9")
depends_on("py-fenics-basix@0.8", type=("build", "link"), when="@0.8")
depends_on("fenics-basix@main", type=("build", "link"), when="@main")
+ depends_on("fenics-basix@0.9", type=("build", "link"), when="@0.9")
depends_on("fenics-basix@0.8", type=("build", "link"), when="@0.8")
depends_on("fenics-basix@0.7", type=("build", "link"), when="@0.7")
depends_on("fenics-basix@0.6", type=("build", "link"), when="@0.6")
depends_on("py-fenics-ffcx@main", type=("build", "run"), when="@main")
+ depends_on("py-fenics-ffcx@0.9", type=("build", "run"), when="@0.9")
depends_on("py-fenics-ffcx@0.8", type=("build", "run"), when="@0.8")
depends_on("py-fenics-ffcx@0.7", type=("build", "run"), when="@0.7")
depends_on("py-fenics-ffcx@0.6", type=("build", "run"), when="@0.6")
depends_on("py-fenics-ufl@main", type=("build", "run"), when="@main")
+ depends_on("py-fenics-ufl@2024.2", type=("build", "run"), when="@0.9")
depends_on("py-fenics-ufl@2024.1", type=("build", "run"), when="@0.8")
depends_on("py-fenics-ufl@2023.2", type=("build", "run"), when="@0.7")
depends_on("py-fenics-ufl@2023.1", type=("build", "run"), when="@0.6")
@@ -58,11 +65,12 @@ class PyFenicsDolfinx(PythonPackage):
depends_on("py-numpy@1.21:", type=("build", "run"))
depends_on("py-mpi4py", type=("build", "run"))
depends_on("py-petsc4py", type=("build", "run"))
- depends_on("py-cffi", type=("build", "run"))
+ depends_on("py-cffi@:1.16", type=("build", "run"))
depends_on("py-nanobind@2:", when="@0.9:", type="build")
depends_on("py-nanobind@1.8:1.9", when="@0.8", type="build")
- depends_on("py-scikit-build-core+pyproject@0.5:", when="@0.8:", type="build")
+ depends_on("py-scikit-build-core+pyproject@0.10:", when="@0.10:", type="build")
+ depends_on("py-scikit-build-core+pyproject@0.5:", when="@0.8:0.9", type="build")
depends_on("py-pybind11@2.7.0:", when="@:0.7", type=("build", "run"))
depends_on("py-setuptools@42:", when="@:0.7", type="build")