damask 3.0.0 and 3.0.0-beta2 (spack#45405)

mvlopri · Aug 23, 2024 · 6fa4c87 · 6fa4c87
1 parent 1de3e1d
commit 6fa4c87
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/var/spack/repos/builtin/packages/damask-grid/package.py b/var/spack/repos/builtin/packages/damask-grid/package.py
@@ -17,6 +17,10 @@ class DamaskGrid(CMakePackage):
 
     license("AGPL-3.0-or-later")
 
+    version("3.0.0", sha256="aaebc65b3b10e6c313132ee97cfed427c115079b7e438cc0727c5207e159019f")
+    version(
+        "3.0.0-beta2", sha256="513567b4643f39e27ae32b9f75463fc6f388c1548d42f0393cc87ba02d075f6a"
+    )
     version(
         "3.0.0-beta", sha256="1e25e409ac559fc437d1887c6ca930677a732db89a3a32499d545dd75e93925c"
     )
@@ -39,8 +43,9 @@ class DamaskGrid(CMakePackage):
     depends_on("c", type="build")  # generated
     depends_on("fortran", type="build")  # generated
 
-    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.21", when="@3.0.0-beta2:")
+    depends_on("petsc@3.20.3:3.20", when="@3.0.0-beta")
+    depends_on("petsc@3.20.2:3.20", 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
@@ -17,6 +17,10 @@ class DamaskMesh(CMakePackage):
 
     license("AGPL-3.0-or-later")
 
+    version("3.0.0", sha256="aaebc65b3b10e6c313132ee97cfed427c115079b7e438cc0727c5207e159019f")
+    version(
+        "3.0.0-beta2", sha256="513567b4643f39e27ae32b9f75463fc6f388c1548d42f0393cc87ba02d075f6a"
+    )
     version(
         "3.0.0-beta", sha256="1e25e409ac559fc437d1887c6ca930677a732db89a3a32499d545dd75e93925c"
     )
@@ -39,8 +43,9 @@ class DamaskMesh(CMakePackage):
     depends_on("c", type="build")  # generated
     depends_on("fortran", type="build")  # generated
 
-    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.21", when="@3.0.0-beta2:")
+    depends_on("petsc@3.20.3:3.20", when="@3.0.0-beta")
+    depends_on("petsc@3.20.2:3.20", 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
@@ -28,13 +28,23 @@ class Damask(BundlePackage):
 
     maintainers("MarDiehl")
 
+    version("3.0.0")
+    version("3.0.0-beta2")
     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", when="@3.0.0", type="run")
+    depends_on("damask-mesh@3.0.0", when="@3.0.0", type="run")
+    depends_on("py-damask@3.0.0", when="@3.0.0", type="run")
+
+    depends_on("damask-grid@3.0.0-beta2", when="@3.0.0-beta2", type="run")
+    depends_on("damask-mesh@3.0.0-beta2", when="@3.0.0-beta2", type="run")
+    depends_on("py-damask@3.0.0-beta2", when="@3.0.0-beta2", type="run")
+
     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")

diff --git a/var/spack/repos/builtin/packages/py-damask/package.py b/var/spack/repos/builtin/packages/py-damask/package.py
@@ -17,6 +17,10 @@ class PyDamask(PythonPackage):
 
     license("AGPL-3.0-or-later")
 
+    version("3.0.0", sha256="aaebc65b3b10e6c313132ee97cfed427c115079b7e438cc0727c5207e159019f")
+    version(
+        "3.0.0-beta2", sha256="513567b4643f39e27ae32b9f75463fc6f388c1548d42f0393cc87ba02d075f6a"
+    )
     version(
         "3.0.0-beta", sha256="1e25e409ac559fc437d1887c6ca930677a732db89a3a32499d545dd75e93925c"
     )