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

Spec.__contains__: restrict to direct build and transitive runtime deps (#49072)

Browse Source 
Co-authored-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
This commit is contained in:
Harmen Stoppels 2025-02-17 13:57:16 +01:00 committed by GitHub
parent 7d4523a9fc
commit 545750873e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/spack/spack/spec.py
View File

@ -3783,8 +3783,11 @@ def __contains__(self, spec):
# if anonymous or same name, we only have to look at the root # if anonymous or same name, we only have to look at the root
if not spec.name or spec.name == self.name: if not spec.name or spec.name == self.name:
return self.satisfies(spec) return self.satisfies(spec)
else: try:
return any(s.satisfies(spec) for s in self.traverse(root=False)) dep = self[spec.name]
except KeyError:
return False
return dep.satisfies(spec)
def eq_dag(self, other, deptypes=True, vs=None, vo=None): def eq_dag(self, other, deptypes=True, vs=None, vo=None):
"""True if the full dependency DAGs of specs are equal.""" """True if the full dependency DAGs of specs are equal."""

5
lib/spack/spack/test/spec_dag.py
View File

@ -933,6 +933,11 @@ def test_indexing_prefers_direct_or_transitive_link_deps():
with pytest.raises(KeyError): with pytest.raises(KeyError):
root["a2"] root["a2"]
# Check consistency of __contains__ with __getitem__
assert "z3 +through_z1" in root
assert "z3 +through_a1" in a1
assert "a2" not in root
def test_getitem_sticks_to_subdag(): def test_getitem_sticks_to_subdag():
"""Test that indexing on Spec by virtual does not traverse outside the dag, which happens in """Test that indexing on Spec by virtual does not traverse outside the dag, which happens in