From bc4ecccfbf5302580c285c8ec1d90cb26cea7005 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 22 Dec 2023 21:26:52 +0100 Subject: damask: add version 3.0.0-alpha8 (#41444) * damask 3.0.0-alpha8 * ensuring correct Python versions for py-damask --- 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 | 10 ++++++++++ 4 files changed, 23 insertions(+) diff --git a/var/spack/repos/builtin/packages/damask-grid/package.py b/var/spack/repos/builtin/packages/damask-grid/package.py index f23f754c90..f2b9230032 100644 --- a/var/spack/repos/builtin/packages/damask-grid/package.py +++ b/var/spack/repos/builtin/packages/damask-grid/package.py @@ -15,6 +15,9 @@ class DamaskGrid(CMakePackage): maintainers("MarDiehl") + version( + "3.0.0-alpha8", sha256="f62c38123213d1c1fe2eb8910b0ffbdc1cac56273c2520f3b64a553363190b9d" + ) version( "3.0.0-alpha7", sha256="442b06b824441293e72ff91b211a555c5d497aedf62be1c4332c426558b848a4" ) @@ -28,6 +31,7 @@ class DamaskGrid(CMakePackage): "3.0.0-alpha4", sha256="0bb8bde43b27d852b1fb6e359a7157354544557ad83d87987b03f5d629ce5493" ) + 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") depends_on("petsc@3.14.0:3.14,3.15.1:3.16", when="@3.0.0-alpha5") diff --git a/var/spack/repos/builtin/packages/damask-mesh/package.py b/var/spack/repos/builtin/packages/damask-mesh/package.py index 893e72fa3c..dcec1afcaa 100644 --- a/var/spack/repos/builtin/packages/damask-mesh/package.py +++ b/var/spack/repos/builtin/packages/damask-mesh/package.py @@ -15,6 +15,9 @@ class DamaskMesh(CMakePackage): maintainers("MarDiehl") + version( + "3.0.0-alpha8", sha256="f62c38123213d1c1fe2eb8910b0ffbdc1cac56273c2520f3b64a553363190b9d" + ) version( "3.0.0-alpha7", sha256="442b06b824441293e72ff91b211a555c5d497aedf62be1c4332c426558b848a4" ) @@ -28,6 +31,7 @@ class DamaskMesh(CMakePackage): "3.0.0-alpha4", sha256="0bb8bde43b27d852b1fb6e359a7157354544557ad83d87987b03f5d629ce5493" ) + 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") depends_on("petsc@3.14.0:3.14,3.15.1:3.16", when="@3.0.0-alpha5") diff --git a/var/spack/repos/builtin/packages/damask/package.py b/var/spack/repos/builtin/packages/damask/package.py index bda1aac1f1..278648a61a 100644 --- a/var/spack/repos/builtin/packages/damask/package.py +++ b/var/spack/repos/builtin/packages/damask/package.py @@ -28,11 +28,16 @@ class Damask(BundlePackage): maintainers("MarDiehl") + 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-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") + depends_on("damask-grid@3.0.0-alpha7", when="@3.0.0-alpha7", type="run") depends_on("damask-mesh@3.0.0-alpha7", when="@3.0.0-alpha7", type="run") depends_on("py-damask@3.0.0-alpha7", when="@3.0.0-alpha7", 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 524cb0bb2f..34486213a1 100644 --- a/var/spack/repos/builtin/packages/py-damask/package.py +++ b/var/spack/repos/builtin/packages/py-damask/package.py @@ -15,6 +15,9 @@ class PyDamask(PythonPackage): maintainers("MarDiehl") + version( + "3.0.0-alpha8", sha256="f62c38123213d1c1fe2eb8910b0ffbdc1cac56273c2520f3b64a553363190b9d" + ) version( "3.0.0-alpha7", sha256="442b06b824441293e72ff91b211a555c5d497aedf62be1c4332c426558b848a4" ) @@ -28,6 +31,13 @@ class PyDamask(PythonPackage): "3.0.0-alpha4", sha256="0bb8bde43b27d852b1fb6e359a7157354544557ad83d87987b03f5d629ce5493" ) + depends_on("py-pandas@0.24:", type=("build", "run"), when="@3.0.0-alpha8:") + depends_on("py-numpy@1.17:", type=("build", "run"), when="@3.0.0-alpha8:") + depends_on("py-scipy@1.2:", type=("build", "run"), when="@3.0.0-alpha8:") + depends_on("py-h5py@2.9:", type=("build", "run"), when="@3.0.0-alpha8:") + depends_on("vtk+python@8.1:", type=("build", "run"), when="@3.0.0-alpha8:") + depends_on("py-matplotlib@3.0:", type=("build", "run"), when="@3.0.0-alpha8:") + depends_on("py-pyyaml@3.12:", type=("build", "run"), when="@3.0.0-alpha8:") depends_on("python@3.8:", type=("build", "run"), when="@3.0.0-alpha6:") depends_on("python@3.7:", type=("build", "run")) depends_on("py-setuptools@40.6:", type="build") -- cgit v1.2.3-60-g2f50