Extends: support spec, not just package name (#27754)

This commit is contained in:
Adam J. Stewart 2021-12-10 06:30:21 -06:00 committed by GitHub
parent dc87157e80
commit 0960c0810c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 1 deletions

View File

@ -466,7 +466,8 @@ def _execute_extends(pkg):
return
_depends_on(pkg, spec, when=when, type=type)
pkg.extendees[spec] = (spack.spec.Spec(spec), kwargs)
spec_obj = spack.spec.Spec(spec)
pkg.extendees[spec_obj.name] = (spec_obj, kwargs)
return _execute_extends

View File

@ -51,3 +51,12 @@ def test_constraints_from_context_are_merged(mock_packages):
assert pkg_cls.dependencies
assert spack.spec.Spec('@0.14:15 ^b@3.8:4.0') in pkg_cls.dependencies['c']
@pytest.mark.regression('27754')
def test_extends_spec(config, mock_packages):
extender = spack.spec.Spec('extends-spec').concretized()
extendee = spack.spec.Spec('extendee').concretized()
assert extender.dependencies
assert extender.package.extends(extendee)

View File

@ -0,0 +1,17 @@
# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack import *
class ExtendsSpec(Package):
"""Package that tests if the extends directive supports a spec."""
homepage = "http://www.example.com"
url = "http://www.example.com/example-1.0.tar.gz"
version('1.0', '0123456789abcdef0123456789abcdef')
extends('extendee@1:')