From 73afa9e1ed87f34404deb9fcccce22f5de8134b5 Mon Sep 17 00:00:00 2001 From: David Hotham Date: Sun, 6 Oct 2024 17:35:16 +0100 Subject: [PATCH] remove support for 'x' in version constraints (#770) --- src/poetry/core/constraints/version/patterns.py | 2 +- .../constraints/version/test_parse_constraint.py | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/poetry/core/constraints/version/patterns.py b/src/poetry/core/constraints/version/patterns.py index d1187e55d..586520ec5 100644 --- a/src/poetry/core/constraints/version/patterns.py +++ b/src/poetry/core/constraints/version/patterns.py @@ -17,7 +17,7 @@ rf"^~=\s*(?P{VERSION_PATTERN})$", re.VERBOSE | re.IGNORECASE ) X_CONSTRAINT = re.compile( - r"^(?P!=|==)?\s*v?(?P(\d+)(?:\.(\d+))?(?:\.(\d+))?)(?:\.[xX*])+$" + r"^(?P!=|==)?\s*v?(?P(\d+)(?:\.(\d+))?(?:\.(\d+))?)(?:\.\*)+$" ) # note that we also allow technically incorrect version patterns with astrix (eg: 3.5.*) diff --git a/tests/constraints/version/test_parse_constraint.py b/tests/constraints/version/test_parse_constraint.py index e71ba5c89..a5af742e3 100644 --- a/tests/constraints/version/test_parse_constraint.py +++ b/tests/constraints/version/test_parse_constraint.py @@ -18,8 +18,6 @@ ("*", VersionRange()), ("*.*", VersionRange()), ("v*.*", VersionRange()), - ("*.x.*", VersionRange()), - ("x.X.x.*", VersionRange()), (">1.0.0", VersionRange(min=Version.from_parts(1, 0, 0))), ("<1.2.3", VersionRange(max=Version.from_parts(1, 2, 3))), ("<=1.2.3", VersionRange(max=Version.from_parts(1, 2, 3), include_max=True)), @@ -68,21 +66,8 @@ def test_parse_constraint(input: str, constraint: Version | VersionRange) -> Non "2.0.*", VersionRange(Version.parse("2.0.dev0"), Version.parse("2.1.dev0"), True), ), - ( - "2.x", - VersionRange(Version.parse("2.dev0"), Version.parse("3.dev0"), True), - ), - ( - "2.x.x", - VersionRange(Version.parse("2.dev0"), Version.parse("3.dev0"), True), - ), - ( - "2.2.X", - VersionRange(Version.parse("2.2.dev0"), Version.parse("2.3.dev0"), True), - ), ("0.*", VersionRange(Version.parse("0.dev0"), Version.parse("1.dev0"), True)), ("0.*.*", VersionRange(Version.parse("0.dev0"), Version.parse("1.dev0"), True)), - ("0.x", VersionRange(Version.parse("0.dev0"), Version.parse("1.dev0"), True)), ( "2.0.post1.*", VersionRange(