folkslinux
/
mamba
mirror of https://github.com/mamba-org/mamba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow leading lowercase letter in version (#3361)

This commit is contained in:
Hind-M 2024-07-25 09:23:39 +02:00 committed by GitHub
parent a10a532fd8
commit ce1c4f22bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmamba/src/specs/version_spec.cpp
View File

@ -423,7 +423,13 @@ namespace mamba::specs
.transform([](specs::Version&& ver)
{ return VersionPredicate::make_starts_with(std::move(ver)); });
}
if (util::is_digit(str.front())) // All versions must start with a digit
// All versions must start with either a digit or a lowercase letter
// The version regex should comply with r"^[\*\.\+!_0-9a-z]+$"
// cf. https://github.com/conda/conda/blob/main/conda/models/version.py#L33
// Note that we don't apply this condition when the version is given with an operator
// In that case, string literals are converted to lowercase in `version.cpp` through
// `Version::parse`
if (util::is_digit(str.front()) || util::is_lower(str.front()))
{
// Glob suffix does change meaning for 1.3.* and 1.3*
if (util::ends_with(str, VersionSpec::glob_suffix_token))

37
libmamba/tests/src/specs/test_match_spec.cpp
View File

@ -82,6 +82,43 @@ TEST_SUITE("specs::match_spec")
CHECK(ms.version().is_explicitly_free());
}
SUBCASE("disperse=v0.9.24")
{
auto ms = MatchSpec::parse("disperse=v0.9.24").value();
CHECK_EQ(ms.name().str(), "disperse");
CHECK_EQ(ms.version().str(), "=0v0.9.24");
CHECK(ms.build_string().is_explicitly_free());
CHECK(ms.build_number().is_explicitly_free());
CHECK_EQ(ms.str(), "disperse=0v0.9.24");
}
SUBCASE("disperse v0.9.24")
{
auto ms = MatchSpec::parse("disperse v0.9.24").value();
CHECK_EQ(ms.name().str(), "disperse");
CHECK_EQ(ms.version().str(), "==0v0.9.24");
CHECK(ms.build_string().is_explicitly_free());
CHECK(ms.build_number().is_explicitly_free());
CHECK_EQ(ms.str(), "disperse==0v0.9.24");
}
SUBCASE("foo V0.9.24")
{
auto ms = MatchSpec::parse("foo V0.9.24");
CHECK_FALSE(ms.has_value());
CHECK_EQ(std::string(ms.error().what()), "Found invalid version predicate in \"V0.9.24\"");
}
SUBCASE("foo=V0.9.24")
{
auto ms = MatchSpec::parse("foo=V0.9.24").value();
CHECK_EQ(ms.name().str(), "foo");
CHECK_EQ(ms.version().str(), "=0v0.9.24");
CHECK(ms.build_string().is_explicitly_free());
CHECK(ms.build_number().is_explicitly_free());
CHECK_EQ(ms.str(), "foo=0v0.9.24");
}
SUBCASE("numpy 1.7*")
{
auto ms = MatchSpec::parse("numpy 1.7*").value();