From e585aeb88375e7434035a56eb675c9b6dbdfa8a1 Mon Sep 17 00:00:00 2001 From: "Garth N. Wells" Date: Mon, 6 May 2024 20:11:02 +0100 Subject: [PATCH] (py)-fenics-dolfinx: version update (#44002) * Update DOLFINx to v0.8 * Fix typo --- .../repos/builtin/packages/fenics-dolfinx/package.py | 3 +++ .../builtin/packages/py-fenics-dolfinx/package.py | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py index 4255cf3a45..d6c9187e6d 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.8.0", sha256="acf3104d9ecc0380677a6faf69eabfafc58d0cce43f7777e1307b95701c7cad9") version("0.7.2", sha256="7d9ce1338ce66580593b376327f23ac464a4ce89ef63c105efc1a38e5eae5c0b") version("0.6.0", sha256="eb8ac2bb2f032b0d393977993e1ab6b4101a84d54023a67206e3eac1a8d79b80") version( @@ -80,12 +81,14 @@ class FenicsDolfinx(CMakePackage): depends_on("pugixml", when="@0.5.0:") depends_on("fenics-ufcx@main", when="@main") + depends_on("fenics-ufcx@0.8", when="@0.8") depends_on("fenics-ufcx@0.7", when="@0.7") depends_on("fenics-ufcx@0.6.0:0.6", when="@0.6.0:0.6") depends_on("fenics-ufcx@0.5.0", when="@0.5.1:0.5") depends_on("fenics-ufcx@0.4.2", when="@0.4.1") depends_on("fenics-basix@main", when="@main") + depends_on("fenics-basix@0.8", when="@0.8") depends_on("fenics-basix@0.7", when="@0.7") depends_on("fenics-basix@0.6.0:0.6", when="@0.6.0:0.6") depends_on("fenics-basix@0.5.1:0.5", when="@0.5.0:0.5") 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 a3a658fc3c..6234c03c22 100644 --- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py @@ -18,6 +18,7 @@ class PyFenicsDolfinx(PythonPackage): license("LGPL-3.0-only") version("main", branch="main") + version("0.8.0", sha256="acf3104d9ecc0380677a6faf69eabfafc58d0cce43f7777e1307b95701c7cad9") version("0.7.2", sha256="7d9ce1338ce66580593b376327f23ac464a4ce89ef63c105efc1a38e5eae5c0b") version("0.6.0", sha256="eb8ac2bb2f032b0d393977993e1ab6b4101a84d54023a67206e3eac1a8d79b80") version( @@ -40,11 +41,13 @@ class PyFenicsDolfinx(PythonPackage): depends_on("hdf5", type="build") depends_on("pkgconfig", type="build") - depends_on("python@3.8:", when="@0.6.1:", type=("build", "run")) + depends_on("python@3.9:", when="@0.8", type=("build", "run")) + depends_on("python@3.8:", when="@0.6.1:0.7", type=("build", "run")) depends_on("python@3.8:3.10", when="@0.5:0.6.0", type=("build", "run")) depends_on("python@3.7:3.10", when="@0.4", type=("build", "run")) depends_on("fenics-dolfinx@main", when="@main") + 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("fenics-dolfinx@0.5.1", when="@0.5.1") @@ -52,19 +55,24 @@ class PyFenicsDolfinx(PythonPackage): depends_on("fenics-dolfinx@0.4.1", when="@0.4.1") depends_on("py-fenics-basix@main", type=("build", "run"), when="@main") + 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.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.0:0.6", type=("build", "link"), when="@0.6.0:0.6") depends_on("fenics-basix@0.5.1:0.5", type=("build", "link"), when="@0.5.0:0.5") depends_on("fenics-basix@0.4.2", type=("build", "link"), when="@0.4.1") depends_on("py-fenics-ffcx@main", type=("build", "run"), when="@main") + 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-ffcx@0.5.0.post0", type=("build", "run"), when="@0.5.0:0.5") depends_on("py-fenics-ffcx@0.4.2", type=("build", "run"), when="@0.4.1") depends_on("py-fenics-ufl@main", type=("build", "run"), when="@main") + 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") depends_on("py-fenics-ufl@2022.2.0", type=("build", "run"), when="@0.5.0:0.5")