From 267da7855947933ffb360b6a7f003782c7df942b Mon Sep 17 00:00:00 2001 From: Peter Scheibel Date: Fri, 22 Apr 2022 11:02:17 -0700 Subject: Package-level submodule attribute: support explicit versions (#30085) --- .../builtin.mock/packages/git-test/package.py | 2 ++ var/spack/repos/builtin/packages/axom/package.py | 23 +++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin.mock/packages/git-test/package.py b/var/spack/repos/builtin.mock/packages/git-test/package.py index ab72e5921e..f9ae590e9a 100644 --- a/var/spack/repos/builtin.mock/packages/git-test/package.py +++ b/var/spack/repos/builtin.mock/packages/git-test/package.py @@ -9,6 +9,8 @@ from spack import * class GitTest(Package): """Mock package that uses git for fetching.""" homepage = "http://www.git-fetch-example.com" + # To be set by test + git = None submodules = True diff --git a/var/spack/repos/builtin/packages/axom/package.py b/var/spack/repos/builtin/packages/axom/package.py index 7b02b25c56..3bbd896603 100644 --- a/var/spack/repos/builtin/packages/axom/package.py +++ b/var/spack/repos/builtin/packages/axom/package.py @@ -38,21 +38,20 @@ class Axom(CachedCMakePackage, CudaPackage): git = "https://github.com/LLNL/axom.git" tags = ['radiuss'] - version('main', branch='main', submodules=True) - version('develop', branch='develop', submodules=True) - version('0.6.1', tag='v0.6.1', submodules=True) - version('0.6.0', tag='v0.6.0', submodules=True) - version('0.5.0', tag='v0.5.0', submodules=True) - version('0.4.0', tag='v0.4.0', submodules=True) - version('0.3.3', tag='v0.3.3', submodules=True) - version('0.3.2', tag='v0.3.2', submodules=True) - version('0.3.1', tag='v0.3.1', submodules=True) - version('0.3.0', tag='v0.3.0', submodules=True) - version('0.2.9', tag='v0.2.9', submodules=True) + version('main', branch='main') + version('develop', branch='develop') + version('0.6.1', tag='v0.6.1') + version('0.6.0', tag='v0.6.0') + version('0.5.0', tag='v0.5.0') + version('0.4.0', tag='v0.4.0') + version('0.3.3', tag='v0.3.3') + version('0.3.2', tag='v0.3.2') + version('0.3.1', tag='v0.3.1') + version('0.3.0', tag='v0.3.0') + version('0.2.9', tag='v0.2.9') @property def submodules(self): - # All git checkouts should also initialize submodules return True patch('scr_examples_gtest.patch', when='@0.6.0:0.6.1') -- cgit v1.2.3-60-g2f50