zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add 'stable' to the list of infinity version names. (#28772)

Browse Source 
* Add 'stable' to the list of infinity version names.
Rename libunwind 1.5-head to 1.5-stable.

* Add stable to the infinite version list in packaging_guide.rst.
This commit is contained in:
Mark W. Krentel 2022-02-16 11:08:51 -06:00 committed by GitHub
parent 884da5e326
commit 87a3b72ef0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/spack/docs/packaging_guide.rst
View File

@ -705,7 +705,8 @@ as follows:
#. The following special strings are considered larger than any other #. The following special strings are considered larger than any other
numeric or non-numeric version component, and satisfy the following 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 #. Numbers are ordered numerically, are less than special strings, and
larger than other non-numeric components. larger than other non-numeric components.

2
lib/spack/spack/version.py
View File

@ -59,7 +59,7 @@
"(?:[+][0-9A-Za-z-]+)?)") "(?:[+][0-9A-Za-z-]+)?)")
# Infinity-like versions. The order in the list implies the comparison rules # 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) iv_min_len = min(len(s) for s in infinity_versions)

10
var/spack/repos/builtin/packages/libunwind/package.py
View File

@ -16,7 +16,7 @@ class Libunwind(AutotoolsPackage):
maintainers = ['mwkrentel'] maintainers = ['mwkrentel']
version('master', branch='master') version('master', branch='master')
version('1.5-head', branch='v1.5-stable') version('1.5-stable', branch='v1.5-stable')
version('1.5.0', sha256='90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017') version('1.5.0', sha256='90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017')
version('1.4.0', sha256='df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435') version('1.4.0', sha256='df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435')
version('1.3.1', sha256='43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8') version('1.3.1', sha256='43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8')
@ -62,10 +62,10 @@ class Libunwind(AutotoolsPackage):
# The libunwind releases contain the autotools generated files, # The libunwind releases contain the autotools generated files,
# but the git repo snapshots do not. # but the git repo snapshots do not.
depends_on('autoconf', type='build', when='@master,1.5-head') depends_on('autoconf', type='build', when='@master,1.5-stable')
depends_on('automake', type='build', when='@master,1.5-head') depends_on('automake', type='build', when='@master,1.5-stable')
depends_on('libtool', type='build', when='@master,1.5-head') depends_on('libtool', type='build', when='@master,1.5-stable')
depends_on('m4', type='build', when='@master,1.5-head') depends_on('m4', type='build', when='@master,1.5-stable')
depends_on('xz', type='link', when='+xz') depends_on('xz', type='link', when='+xz')
depends_on('zlib', type='link', when='+zlib') depends_on('zlib', type='link', when='+zlib')