hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Spec versions: allow git. references for branches with / (#38239)" (#39354)

Browse source 
This reverts commit 3453259c98.
This commit is contained in:
Harmen Stoppels 2023-08-10 08:56:39 +02:00 committed by GitHub
parent aeb9a92845
commit 532a37e7ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/spack/spack/parser.py
View file

@ -76,9 +76,7 @@
IDENTIFIER = r"([a-zA-Z_0-9][a-zA-Z_0-9\-]*)"
DOTTED_IDENTIFIER = rf"({IDENTIFIER}(\.{IDENTIFIER})+)"
GIT_HASH = r"([A-Fa-f0-9]{40})"
#: Git refs include branch names, and can contain "." and "/"
GIT_REF = r"([a-zA-Z_0-9][a-zA-Z_0-9./\-]*)"
GIT_VERSION = rf"((git\.({GIT_REF}))|({GIT_HASH}))"
GIT_VERSION = rf"((git\.({DOTTED_IDENTIFIER}|{IDENTIFIER}))|({GIT_HASH}))"
NAME = r"[a-zA-Z_0-9][a-zA-Z_0-9\-.]*"
@ -130,7 +128,6 @@ class TokenType(TokenBase):
DEPENDENCY = r"(\^)"
# Version
VERSION_HASH_PAIR = rf"(@({GIT_VERSION})=({VERSION}))"
GIT_VERSION = rf"@({GIT_VERSION})"
VERSION = rf"(@\s*({VERSION_LIST}))"
# Variants
PROPAGATED_BOOL_VARIANT = rf"((\+\+|~~|--)\s*{NAME})"
@ -367,10 +364,8 @@ def parse(self, initial_spec: Optional[spack.spec.Spec] = None) -> Optional[spac
compiler_name.strip(), compiler_version
)
self.has_compiler = True
elif (
self.ctx.accept(TokenType.VERSION_HASH_PAIR)
or self.ctx.accept(TokenType.GIT_VERSION)
or self.ctx.accept(TokenType.VERSION)
elif self.ctx.accept(TokenType.VERSION) or self.ctx.accept(
TokenType.VERSION_HASH_PAIR
):
self.hash_not_parsed_or_raise(initial_spec, self.ctx.current_token.value)
if self.has_version:

8
lib/spack/spack/test/spec_syntax.py
View file

@ -517,14 +517,6 @@ def _specfile_for(spec_str, filename):
[Token(TokenType.VERSION, value="@:0.4"), Token(TokenType.COMPILER, value="% nvhpc")],
"@:0.4%nvhpc",
),
(
"zlib@git.foo/bar",
[
Token(TokenType.UNQUALIFIED_PACKAGE_NAME, "zlib"),
Token(TokenType.GIT_VERSION, "@git.foo/bar"),
],
"zlib@git.foo/bar",
),
],
)
def test_parse_single_spec(spec_str, tokens, expected_roundtrip):

20
lib/spack/spack/test/versions.py
View file

@ -676,26 +676,6 @@ def test_git_ref_comparisons(mock_git_version_info, install_mockery, mock_packag
assert str(spec_branch.version) == "git.1.x=1.2"
@pytest.mark.skipif(sys.platform == "win32", reason="Not supported on Windows (yet)")
def test_git_branch_with_slash():
class MockLookup(object):
def get(self, ref):
assert ref == "feature/bar"
return "1.2", 0
v = spack.version.from_string("git.feature/bar")
assert isinstance(v, GitVersion)
v.attach_lookup(MockLookup())
# Create a version range
test_number_version = spack.version.from_string("1.2")
v.satisfies(test_number_version)
serialized = VersionList([v]).to_dict()
v_deserialized = VersionList.from_dict(serialized)
assert v_deserialized[0].ref == "feature/bar"
@pytest.mark.parametrize(
"string,git",
[