From f550262efb50c56da97c23af5706a51237961af0 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 29 Jan 2024 16:33:22 +0100 Subject: update damask to 3.0.0-beta (#42259) --- var/spack/repos/builtin/packages/damask-grid/package.py | 4 ++++ var/spack/repos/builtin/packages/damask-mesh/package.py | 4 ++++ var/spack/repos/builtin/packages/damask/package.py | 5 +++++ var/spack/repos/builtin/packages/py-damask/package.py | 5 ++++- 4 files changed, 17 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/damask-grid/package.py b/var/spack/repos/builtin/packages/damask-grid/package.py index 68a973b09e..1335c01215 100644 --- a/var/spack/repos/builtin/packages/damask-grid/package.py +++ b/var/spack/repos/builtin/packages/damask-grid/package.py @@ -17,6 +17,9 @@ class DamaskGrid(CMakePackage): license("AGPL-3.0-or-later") + version( + "3.0.0-beta", sha256="1e25e409ac559fc437d1887c6ca930677a732db89a3a32499d545dd75e93925c" + ) version( "3.0.0-alpha8", sha256="f62c38123213d1c1fe2eb8910b0ffbdc1cac56273c2520f3b64a553363190b9d" ) @@ -33,6 +36,7 @@ class DamaskGrid(CMakePackage): "3.0.0-alpha4", sha256="0bb8bde43b27d852b1fb6e359a7157354544557ad83d87987b03f5d629ce5493" ) + depends_on("petsc@3.20.3:3.21", when="@3.0.0-beta") depends_on("petsc@3.20.2:3.21", when="@3.0.0-alpha8") depends_on("petsc@3.17.1:3.18", when="@3.0.0-alpha7") depends_on("petsc@3.16.5:3.16", when="@3.0.0-alpha6") diff --git a/var/spack/repos/builtin/packages/damask-mesh/package.py b/var/spack/repos/builtin/packages/damask-mesh/package.py index 2e537477a2..f39f30de14 100644 --- a/var/spack/repos/builtin/packages/damask-mesh/package.py +++ b/var/spack/repos/builtin/packages/damask-mesh/package.py @@ -17,6 +17,9 @@ class DamaskMesh(CMakePackage): license("AGPL-3.0-or-later") + version( + "3.0.0-beta", sha256="1e25e409ac559fc437d1887c6ca930677a732db89a3a32499d545dd75e93925c" + ) version( "3.0.0-alpha8", sha256="f62c38123213d1c1fe2eb8910b0ffbdc1cac56273c2520f3b64a553363190b9d" ) @@ -33,6 +36,7 @@ class DamaskMesh(CMakePackage): "3.0.0-alpha4", sha256="0bb8bde43b27d852b1fb6e359a7157354544557ad83d87987b03f5d629ce5493" ) + depends_on("petsc@3.20.3:3.21", when="@3.0.0-beta") depends_on("petsc@3.20.2:3.21", when="@3.0.0-alpha8") depends_on("petsc@3.17.1:3.18", when="@3.0.0-alpha7") depends_on("petsc@3.16.5:3.16", when="@3.0.0-alpha6") diff --git a/var/spack/repos/builtin/packages/damask/package.py b/var/spack/repos/builtin/packages/damask/package.py index 84bf0caff5..c7a0e632a6 100644 --- a/var/spack/repos/builtin/packages/damask/package.py +++ b/var/spack/repos/builtin/packages/damask/package.py @@ -28,12 +28,17 @@ class Damask(BundlePackage): maintainers("MarDiehl") + version("3.0.0-beta") version("3.0.0-alpha8") version("3.0.0-alpha7") version("3.0.0-alpha6") version("3.0.0-alpha5") version("3.0.0-alpha4") + depends_on("damask-grid@3.0.0-beta", when="@3.0.0-beta", type="run") + depends_on("damask-mesh@3.0.0-beta", when="@3.0.0-beta", type="run") + depends_on("py-damask@3.0.0-beta", when="@3.0.0-beta", type="run") + depends_on("damask-grid@3.0.0-alpha8", when="@3.0.0-alpha8", type="run") depends_on("damask-mesh@3.0.0-alpha8", when="@3.0.0-alpha8", type="run") depends_on("py-damask@3.0.0-alpha8", when="@3.0.0-alpha8", type="run") diff --git a/var/spack/repos/builtin/packages/py-damask/package.py b/var/spack/repos/builtin/packages/py-damask/package.py index ca2ab0ae54..c56773e98b 100644 --- a/var/spack/repos/builtin/packages/py-damask/package.py +++ b/var/spack/repos/builtin/packages/py-damask/package.py @@ -15,8 +15,11 @@ class PyDamask(PythonPackage): maintainers("MarDiehl") - license("AGPL-3.0-only") + license("AGPL-3.0-or-later") + version( + "3.0.0-beta", sha256="1e25e409ac559fc437d1887c6ca930677a732db89a3a32499d545dd75e93925c" + ) version( "3.0.0-alpha8", sha256="f62c38123213d1c1fe2eb8910b0ffbdc1cac56273c2520f3b64a553363190b9d" ) -- cgit v1.2.3-70-g09d2