diff options
| author | Chris White <white238@llnl.gov> | 2020-08-12 18:15:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-12 20:15:59 -0500 |
| commit | 105caa729709ab8ebfac65a26da03861353bbd1a (patch) | |
| tree | 9d2149d9af3d9dba5e7764aa30194b5f160d6df8 /lib | |
| parent | fa216e5f153f0529c902ecf34fc906338ea9632a (diff) | |
| download | spack-105caa729709ab8ebfac65a26da03861353bbd1a.tar.gz spack-105caa729709ab8ebfac65a26da03861353bbd1a.tar.bz2 spack-105caa729709ab8ebfac65a26da03861353bbd1a.tar.xz spack-105caa729709ab8ebfac65a26da03861353bbd1a.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/version.py | 2 |
1 files changed, 1 insertions, 1 deletions
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): |