summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2024-01-04 00:16:08 -0800
committerGitHub <noreply@github.com>2024-01-04 09:16:08 +0100
commitc46f3cfa8c6592ed7bfa49b35da25a0ff56ddb17 (patch)
treee09410d50b3b199977891f1d009cc06a8200ac5a /lib
parentd8ec337f51fac9ebf6bcda3eb353be9ce1a5e112 (diff)
downloadspack-c46f3cfa8c6592ed7bfa49b35da25a0ff56ddb17.tar.gz
spack-c46f3cfa8c6592ed7bfa49b35da25a0ff56ddb17.tar.bz2
spack-c46f3cfa8c6592ed7bfa49b35da25a0ff56ddb17.tar.xz
spack-c46f3cfa8c6592ed7bfa49b35da25a0ff56ddb17.zip
extensions: remove unused `extendee_args()` method (#41942)
This method is vestigial; the only arg we ever used was `ignore=`, and that was eliminated in #29317 and #35588. The `kwargs` field of the extensions dictionary is actually completely unused now. Add a note for future removal.
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/directives.py9
-rw-r--r--lib/spack/spack/package_base.py14
-rw-r--r--lib/spack/spack/test/package_class.py6
3 files changed, 6 insertions, 23 deletions
diff --git a/lib/spack/spack/directives.py b/lib/spack/spack/directives.py
index a3ccee1816..2d5c46d698 100644
--- a/lib/spack/spack/directives.py
+++ b/lib/spack/spack/directives.py
@@ -568,7 +568,7 @@ def depends_on(spec, when=None, type=dt.DEFAULT_TYPES, patches=None):
@directive(("extendees", "dependencies"))
-def extends(spec, type=("build", "run"), **kwargs):
+def extends(spec, when=None, type=("build", "run"), patches=None):
"""Same as depends_on, but also adds this package to the extendee list.
keyword arguments can be passed to extends() so that extension
@@ -578,14 +578,15 @@ def extends(spec, type=("build", "run"), **kwargs):
"""
def _execute_extends(pkg):
- when = kwargs.get("when")
when_spec = make_when_spec(when)
if not when_spec:
return
- _depends_on(pkg, spec, when=when, type=type)
+ _depends_on(pkg, spec, when=when, type=type, patches=patches)
spec_obj = spack.spec.Spec(spec)
- pkg.extendees[spec_obj.name] = (spec_obj, kwargs)
+
+ # TODO: the values of the extendees dictionary are not used. Remove in next refactor.
+ pkg.extendees[spec_obj.name] = (spec_obj, None)
return _execute_extends
diff --git a/lib/spack/spack/package_base.py b/lib/spack/spack/package_base.py
index e5016f54f3..d1a2387f77 100644
--- a/lib/spack/spack/package_base.py
+++ b/lib/spack/spack/package_base.py
@@ -1260,22 +1260,10 @@ class PackageBase(WindowsRPath, PackageViewMixin, metaclass=PackageMeta):
else:
# If it's not concrete, then return the spec from the
# extends() directive since that is all we know so far.
- spec_str, kwargs = next(iter(self.extendees.items()))
+ spec_str = next(iter(self.extendees))
return spack.spec.Spec(spec_str)
@property
- def extendee_args(self):
- """
- Spec of the extendee of this package, or None if it is not an extension
- """
- if not self.extendees:
- return None
-
- # TODO: allow multiple extendees.
- name = next(iter(self.extendees))
- return self.extendees[name][1]
-
- @property
def is_extension(self):
# if it is concrete, it's only an extension if it actually
# dependes on the extendee.
diff --git a/lib/spack/spack/test/package_class.py b/lib/spack/spack/test/package_class.py
index 46fd560185..2b1dca6e33 100644
--- a/lib/spack/spack/test/package_class.py
+++ b/lib/spack/spack/test/package_class.py
@@ -268,12 +268,6 @@ def test_package_fetcher_fails():
pkg.fetcher
-def test_package_no_extendees():
- s = spack.spec.Spec("a")
- pkg = BaseTestPackage(s)
- assert pkg.extendee_args is None
-
-
def test_package_test_no_compilers(mock_packages, monkeypatch, capfd):
def compilers(compiler, arch_spec):
return None