From a7a51ee5cf5aaba5d47eb26a789fd2cd7e50df75 Mon Sep 17 00:00:00 2001 From: "Garth N. Wells" Date: Thu, 2 May 2024 17:53:31 +0100 Subject: [PATCH] py-fenics-ffcx: update to v0.8 (#43929) * Update FFCx and UFCx to v0.8 * Syntax fix --- var/spack/repos/builtin/packages/fenics-ufcx/package.py | 1 + var/spack/repos/builtin/packages/py-fenics-ffcx/package.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/fenics-ufcx/package.py b/var/spack/repos/builtin/packages/fenics-ufcx/package.py index 93657bb9d0..af177d7fb0 100644 --- a/var/spack/repos/builtin/packages/fenics-ufcx/package.py +++ b/var/spack/repos/builtin/packages/fenics-ufcx/package.py @@ -19,6 +19,7 @@ class FenicsUfcx(CMakePackage): license("LGPL-3.0-or-later") version("main", branch="main") + version("0.8.0", sha256="8a854782dbd119ec1c23c4522a2134d5281e7f1bd2f37d64489f75da055282e3") version("0.7.0", sha256="7f3c3ca91d63ce7831d37799cc19d0551bdcd275bdfa4c099711679533dd1c71") version("0.6.0", sha256="076fad61d406afffd41019ae1abf6da3f76406c035c772abad2156127667980e") version( diff --git a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py index 37017ad6c8..a9f6ef6b58 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py @@ -17,6 +17,7 @@ class PyFenicsFfcx(PythonPackage): license("LGPL-3.0-or-later") version("main", branch="main") + version("0.8.0", sha256="8a854782dbd119ec1c23c4522a2134d5281e7f1bd2f37d64489f75da055282e3") version("0.7.0", sha256="7f3c3ca91d63ce7831d37799cc19d0551bdcd275bdfa4c099711679533dd1c71") version("0.6.0", sha256="076fad61d406afffd41019ae1abf6da3f76406c035c772abad2156127667980e") version( @@ -30,7 +31,8 @@ class PyFenicsFfcx(PythonPackage): deprecated=True, ) - depends_on("python@3.8:", when="@0.7:", type=("build", "run")) + depends_on("python@3.9:", when="@0.8:", type=("build", "run")) + depends_on("python@3.8:", when="@:0.7", type=("build", "run")) depends_on("py-setuptools@62:", when="@0.7:", type="build") # Runtime dependency on pkg_resources from setuptools at 0.6.0 depends_on("py-setuptools@58:", when="@0.4.2:0.6", type=("build", "run")) @@ -42,13 +44,14 @@ class PyFenicsFfcx(PythonPackage): depends_on("py-numpy@1.21:", type=("build", "run")) depends_on("py-fenics-ufl@main", type=("build", "run"), when="@main") - depends_on("py-fenics-ufl@2023.3.0:", type=("build", "run"), when="@0.8") + depends_on("py-fenics-ufl@2024.1.0:", type=("build", "run"), when="@0.8") depends_on("py-fenics-ufl@2023.2.0", 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") depends_on("py-fenics-ufl@2022.1.0", type=("build", "run"), when="@0.4.2") depends_on("py-fenics-basix@main", type=("build", "run"), when="@main") + depends_on("py-fenics-basix@0.8", type=("build", "run"), when="@0.8") depends_on("py-fenics-basix@0.7", type=("build", "run"), when="@0.7") depends_on("py-fenics-basix@0.6.0:0.6", type=("build", "run"), when="@0.6.0:0.6") depends_on("py-fenics-basix@0.5.1:0.5", type=("build", "run"), when="@0.5.0:0.5")