diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/docs/packaging_guide.rst | 3 | ||||
| -rw-r--r-- | lib/spack/spack/version.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index a65a363d19..efb0232e19 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -705,7 +705,8 @@ as follows: #. The following special strings are considered larger than any other numeric or non-numeric version component, and satisfy the following - order between themselves: ``develop > main > master > head > trunk``. + order between themselves: + ``develop > main > master > head > trunk > stable``. #. Numbers are ordered numerically, are less than special strings, and larger than other non-numeric components. diff --git a/lib/spack/spack/version.py b/lib/spack/spack/version.py index 31a585469b..4c54fb08b2 100644 --- a/lib/spack/spack/version.py +++ b/lib/spack/spack/version.py @@ -59,7 +59,7 @@ SEMVER_REGEX = re.compile(".+(?P<semver>([0-9]+)[.]([0-9]+)[.]([0-9]+)" "(?:[+][0-9A-Za-z-]+)?)") # Infinity-like versions. The order in the list implies the comparison rules -infinity_versions = ['develop', 'main', 'master', 'head', 'trunk'] +infinity_versions = ['develop', 'main', 'master', 'head', 'trunk', 'stable'] iv_min_len = min(len(s) for s in infinity_versions) |