From 105caa729709ab8ebfac65a26da03861353bbd1a Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 12 Aug 2020 18:15:59 -0700 Subject: Axom + Conduit updates (#17863) * Loosen Axom's variants, add shared variant for axom, fix clang/xlf rpath'ing problem on blueos * Fix flake8 * Add main branch to list of known git branches --- lib/spack/spack/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/spack/spack/version.py b/lib/spack/spack/version.py index 0c7399c3fb..44e03edb5c 100644 --- a/lib/spack/spack/version.py +++ b/lib/spack/spack/version.py @@ -40,7 +40,7 @@ __all__ = ['Version', 'VersionRange', 'VersionList', 'ver'] VALID_VERSION = r'[A-Za-z0-9_.-]' # Infinity-like versions. The order in the list implies the comparison rules -infinity_versions = ['develop', 'master', 'head', 'trunk'] +infinity_versions = ['develop', 'main', 'master', 'head', 'trunk'] def int_if_int(string): -- cgit v1.2.3-70-g09d2