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

Bugfix: Simplify preferred-test versions; set checksum defaults (#28026)

Browse Source 
* Simplify preferred-test versions; set checksum defaults

* Fix test_preferred failure
This commit is contained in:
Tamara Dahlgren 2021-12-15 21:55:28 -08:00 committed by GitHub
parent 89044ff5d5
commit 9240614928
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/cmd/checksum.py
View File

@ -25,17 +25,17 @@
def setup_parser(subparser): def setup_parser(subparser):
subparser.add_argument( subparser.add_argument(
'--keep-stage', action='store_true', '--keep-stage', action='store_true', default=False,
help="don't clean up staging area when command completes") help="don't clean up staging area when command completes")
sp = subparser.add_mutually_exclusive_group() sp = subparser.add_mutually_exclusive_group()
sp.add_argument( sp.add_argument(
'-b', '--batch', action='store_true', '-b', '--batch', action='store_true', default=False,
help="don't ask which versions to checksum") help="don't ask which versions to checksum")
sp.add_argument( sp.add_argument(
'-l', '--latest', action='store_true', '-l', '--latest', action='store_true', default=False,
help="checksum the latest available version only") help="checksum the latest available version only")
sp.add_argument( sp.add_argument(
'-p', '--preferred', action='store_true', '-p', '--preferred', action='store_true', default=False,
help="checksum the preferred version only") help="checksum the preferred version only")
arguments.add_common_arguments(subparser, ['package']) arguments.add_common_arguments(subparser, ['package'])
subparser.add_argument( subparser.add_argument(

2
lib/spack/spack/test/cmd/audit.py
View File

@ -41,7 +41,7 @@ def test_audit_packages_https(mutable_config, mock_packages):
assert audit.returncode == 1 assert audit.returncode == 1
# This uses http and should fail # This uses http and should fail
audit('packages-https', "preferred-test", fail_on_error=False) audit('packages-https', "test-dependency", fail_on_error=False)
assert audit.returncode == 1 assert audit.returncode == 1
# providing one or more package names with https should work # providing one or more package names with https should work

4
lib/spack/spack/test/cmd/checksum.py
View File

@ -30,7 +30,7 @@ def test_checksum_args(arguments, expected):
@pytest.mark.parametrize('arguments,expected', [ @pytest.mark.parametrize('arguments,expected', [
(['--batch', 'preferred-test'], 'versions of preferred-test'), (['--batch', 'preferred-test'], 'version of preferred-test'),
(['--latest', 'preferred-test'], 'Found 1 version'), (['--latest', 'preferred-test'], 'Found 1 version'),
(['--preferred', 'preferred-test'], 'Found 1 version'), (['--preferred', 'preferred-test'], 'Found 1 version'),
]) ])
@ -47,7 +47,7 @@ def _get_number(*args, **kwargs):
monkeypatch.setattr(tty, 'get_number', _get_number) monkeypatch.setattr(tty, 'get_number', _get_number)
output = spack_checksum('preferred-test') output = spack_checksum('preferred-test')
assert 'versions of preferred-test' in output assert 'version of preferred-test' in output
assert 'version(' in output assert 'version(' in output

10
lib/spack/spack/test/concretize_preferences.py
View File

@ -176,16 +176,16 @@ def test_preferred_providers(self):
def test_preferred(self): def test_preferred(self):
""""Test packages with some version marked as preferred=True""" """"Test packages with some version marked as preferred=True"""
spec = Spec('preferred-test') spec = Spec('python')
spec.concretize() spec.concretize()
assert spec.version == Version('0.2.15') assert spec.version == Version('2.7.11')
# now add packages.yaml with versions other than preferred # now add packages.yaml with versions other than preferred
# ensure that once config is in place, non-preferred version is used # ensure that once config is in place, non-preferred version is used
update_packages('preferred-test', 'version', ['0.2.16']) update_packages('python', 'version', ['3.5.0'])
spec = Spec('preferred-test') spec = Spec('python')
spec.concretize() spec.concretize()
assert spec.version == Version('0.2.16') assert spec.version == Version('3.5.0')
def test_develop(self): def test_develop(self):
"""Test concretization with develop-like versions""" """Test concretization with develop-like versions"""

12
var/spack/repos/builtin.mock/packages/preferred-test/package.py
View File

@ -7,11 +7,9 @@
class PreferredTest(Package): class PreferredTest(Package):
"""Dummy package with develop version and preffered version""" """Dummy package with develop version and preferred version"""
homepage = "http://www.openblas.net" homepage = "https://github.com/LLNL/mpileaks"
url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz" url = "https://github.com/LLNL/mpileaks/releases/download/v1.0/mpileaks-1.0.tar.gz"
version('develop', git='https://github.com/dummy/repo.git') version('develop', git='https://github.com/LLNL/mpileaks.git')
version('0.2.16', 'b1190f3d3471685f17cfd1ec1d252ac9') version('1.0', sha256='2e34cc4505556d1c1f085758e26f2f8eea0972db9382f051b2dcfb1d7d9e1825', preferred=True)
version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9', preferred=True)
version('0.2.14', 'b1190f3d3471685f17cfd1ec1d252ac9')