From f5c0bc194f25f425d034ff4eed65a69a21fcd215 Mon Sep 17 00:00:00 2001 From: "Elsa Gonsiorowski, PhD" Date: Mon, 12 Sep 2022 05:38:05 -0400 Subject: SCR: add v3.0.1 (#32555) --- var/spack/repos/builtin/packages/axl/package.py | 3 +- var/spack/repos/builtin/packages/scr/package.py | 44 +++++++++++++++---------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/var/spack/repos/builtin/packages/axl/package.py b/var/spack/repos/builtin/packages/axl/package.py index 915ed6bc62..19b76a83f8 100644 --- a/var/spack/repos/builtin/packages/axl/package.py +++ b/var/spack/repos/builtin/packages/axl/package.py @@ -25,6 +25,7 @@ class Axl(CMakePackage): maintainers = ["CamStan", "gonsie"] version("main", branch="main") + version("0.7.1", sha256="526a055c072c85cc989beca656717e06b128f148fda8eb19d1d9b43a3325b399") version("0.7.0", sha256="840ef61eadc9aa277d128df08db4cdf6cfa46b8fcf47b0eee0972582a61fbc50") version("0.6.0", sha256="86edb35f99b63c0ffb9dd644a019a63b062923b4efc95c377e92a1b13e79f537") version("0.5.0", sha256="9f3bbb4de563896551bdb68e889ba93ea1984586961ad8c627ed766bff020acf") @@ -45,7 +46,7 @@ class Axl(CMakePackage): depends_on("zlib", type="link") depends_on("kvtree@main", when="@main") - depends_on("kvtree@1.3.0", when="@0.6.0") + depends_on("kvtree@1.3.0", when="@0.6.0:") variant( "async_api", diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py index 5a4dfda834..9f6bdc2015 100644 --- a/var/spack/repos/builtin/packages/scr/package.py +++ b/var/spack/repos/builtin/packages/scr/package.py @@ -33,10 +33,11 @@ class Scr(CMakePackage): version("legacy", branch="legacy") version( - "3.0", - sha256="e204d3e99a49efac50b4bedc7ac05f55a05f1a65429500d919900c82490532cc", + "3.0.1", + sha256="ba8f9e676aec8176ecc46c31a4f470ac95047101654de8cc88e01a1f9d95665a", preferred=True, ) + version("3.0", sha256="e204d3e99a49efac50b4bedc7ac05f55a05f1a65429500d919900c82490532cc") version( "3.0rc2", sha256="4b2a718af56b3683e428d25a2269c038e9452db734221d370e3023a491477fad", @@ -74,21 +75,14 @@ class Scr(CMakePackage): # SCR legacy is anything 2.x.x or earlier # SCR components is anything 3.x.x or later - depends_on("axl@0.4.0", when="@3.0rc1") - depends_on("er@0.0.4", when="@3.0rc1") - depends_on("kvtree@1.1.1", when="@3.0rc1") - depends_on("rankstr@0.0.3", when="@3.0rc1") - depends_on("redset@0.0.5", when="@3.0rc1") - depends_on("shuffile@0.0.4", when="@3.0rc1") - depends_on("spath@0.0.2", when="@3.0rc1") - - depends_on("axl@0.5.0:", when="@3.0rc2") - depends_on("er@0.1.0:", when="@3.0rc2") - depends_on("kvtree@1.2.0:", when="@3.0rc2") - depends_on("rankstr@0.1.0:", when="@3.0rc2") - depends_on("redset@0.1.0:", when="@3.0rc2") - depends_on("shuffile@0.1.0:", when="@3.0rc2") - depends_on("spath@0.1.0:", when="@3.0rc2") + depends_on("axl@0.7.1", when="@3.0.1:") + depends_on("er@0.2.0", when="@3.0.1:") + depends_on("kvtree@1.3.0", when="@3.0.1:") + depends_on("rankstr@0.1.0", when="@3.0.1:") + depends_on("redset@0.2.0", when="@3.0.1:") + depends_on("shuffile@0.2.0", when="@3.0.1:") + depends_on("spath@0.2.0", when="@3.0.1:") + depends_on("dtcmp@1.1.4", when="@3.0.1:") depends_on("axl@0.6.0", when="@3.0.0:") depends_on("er@0.2.0", when="@3.0.0:") @@ -99,6 +93,22 @@ class Scr(CMakePackage): depends_on("spath@0.2.0", when="@3.0.0:") depends_on("dtcmp@1.1.4", when="@3.0.0:") + depends_on("axl@0.5.0:", when="@3.0rc2") + depends_on("er@0.1.0:", when="@3.0rc2") + depends_on("kvtree@1.2.0:", when="@3.0rc2") + depends_on("rankstr@0.1.0:", when="@3.0rc2") + depends_on("redset@0.1.0:", when="@3.0rc2") + depends_on("shuffile@0.1.0:", when="@3.0rc2") + depends_on("spath@0.1.0:", when="@3.0rc2") + + depends_on("axl@0.4.0", when="@3.0rc1") + depends_on("er@0.0.4", when="@3.0rc1") + depends_on("kvtree@1.1.1", when="@3.0rc1") + depends_on("rankstr@0.0.3", when="@3.0rc1") + depends_on("redset@0.0.5", when="@3.0rc1") + depends_on("shuffile@0.0.4", when="@3.0rc1") + depends_on("spath@0.0.2", when="@3.0rc1") + # DTCMP is an optional dependency up until 3.x, required thereafter variant( "dtcmp", -- cgit v1.2.3-60-g2f50