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

Use pkg_cls in spack.mirror.get_all_versions (#31636)

Browse Source 
fixes #31627

spack.mirror.get_all_versions now uses the package class
instead of the package object in its implementation.

Ensure spec is concrete before staging for mirrors
This commit is contained in:
Massimiliano Culpo 2022-07-22 10:04:17 +02:00 committed by GitHub
parent 2b0b573827
commit 5cf7bf3770
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/spack/spack/mirror.py
View File

@ -421,18 +421,16 @@ def get_all_versions(specs):
version, this information will be omitted in the new set; for example; the version, this information will be omitted in the new set; for example; the
new set of specs will not include variant settings. new set of specs will not include variant settings.
""" """
version_specs = [] version_specs = []
for spec in specs: for spec in specs:
pkg = spec.package pkg_cls = spack.repo.path.get_pkg_class(spec.name)
# Skip any package that has no known versions. # Skip any package that has no known versions.
if not pkg.versions: if not pkg_cls.versions:
tty.msg("No safe (checksummed) versions for package %s" % pkg.name) tty.msg("No safe (checksummed) versions for package %s" % pkg_cls.name)
continue continue
for version in pkg.versions: for version in pkg_cls.versions:
version_spec = spack.spec.Spec(pkg.name) version_spec = spack.spec.Spec(pkg_cls.name)
version_spec.versions = VersionList([version]) version_spec.versions = VersionList([version])
version_specs.append(version_spec) version_specs.append(version_spec)
@ -639,6 +637,10 @@ def error(self):
def _add_single_spec(spec, mirror, mirror_stats): def _add_single_spec(spec, mirror, mirror_stats):
# Ensure that the spec is concrete, since we'll stage it later
if not spec.concrete:
spec = spec.concretized()
tty.msg("Adding package {pkg} to mirror".format( tty.msg("Adding package {pkg} to mirror".format(
pkg=spec.format("{name}{@version}") pkg=spec.format("{name}{@version}")
)) ))

13
lib/spack/spack/test/mirror.py
View File

@ -320,3 +320,16 @@ def test_mirror_cache_symlinks(tmpdir):
assert os.path.exists(link_target) assert os.path.exists(link_target)
assert (os.path.normpath(link_target) == assert (os.path.normpath(link_target) ==
os.path.join(cache.root, reference.storage_path)) os.path.join(cache.root, reference.storage_path))
@pytest.mark.regression('31627')
@pytest.mark.parametrize('specs,expected_specs', [
(['a'], ['a@1.0', 'a@2.0']),
(['a', 'brillig'], ['a@1.0', 'a@2.0', 'brillig@1.0.0', 'brillig@2.0.0']),
])
def test_get_all_versions(specs, expected_specs):
specs = [Spec(s) for s in specs]
output_list = spack.mirror.get_all_versions(specs)
output_list = [str(x) for x in output_list]
# Compare sets since order is not important
assert set(output_list) == set(expected_specs)