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

dev_path and commit mutually exclusive

Browse Source
This commit is contained in:
Philip Sakievich 2025-02-15 07:22:30 -07:00 committed by psakiev
parent f070163a37
commit 011da2d44a
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/spack/spack/solver/asp.py
View File

@ -4278,6 +4278,9 @@ def _specs_with_commits(spec):
if not (has_commit_var or has_git_version): if not (has_commit_var or has_git_version):
return return
if "dev_path" in spec.variants:
assert False
# Specs with commit variants # Specs with commit variants
# - variant value satsifies commit regex # - variant value satsifies commit regex
# - paired to a GitVersion or version that is associated with a branch/tag # - paired to a GitVersion or version that is associated with a branch/tag

2
lib/spack/spack/test/concretization/core.py
View File

@ -3311,11 +3311,13 @@ def _ensure_cache_hits(self, problem: str):
@pytest.mark.parametrize( @pytest.mark.parametrize(
"spec_str, should_pass, error_type", "spec_str, should_pass, error_type",
[ [
# TODO write actual Exceptions for these to give good error messages
(f"git-ref-package@main commit={'a' * 40}", True, None), (f"git-ref-package@main commit={'a' * 40}", True, None),
(f"git-ref-package@main commit={'a' * 39}", False, AssertionError), (f"git-ref-package@main commit={'a' * 39}", False, AssertionError),
(f"git-ref-package@2.1.6 commit={'a' * 40}", False, AssertionError), (f"git-ref-package@2.1.6 commit={'a' * 40}", False, AssertionError),
(f"git-ref-package@git.2.1.6=2.1.6 commit={'a' * 40}", True, None), (f"git-ref-package@git.2.1.6=2.1.6 commit={'a' * 40}", True, None),
(f"git-ref-package@2.1.6 commit={'a' * 40}", False, AssertionError), (f"git-ref-package@2.1.6 commit={'a' * 40}", False, AssertionError),
(f"git-ref-package@main commit={'a' * 40} dev_path=/foo/bar/", False, AssertionError),
], ],
) )
def test_spec_containing_commit_variant(spec_str, should_pass, error_type): def test_spec_containing_commit_variant(spec_str, should_pass, error_type):