remove support for 'x' in version constraints (#770)

python-poetry · Oct 6, 2024 · 73afa9e · 73afa9e
1 parent 537ed4c
commit 73afa9e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/src/poetry/core/constraints/version/patterns.py b/src/poetry/core/constraints/version/patterns.py
@@ -17,7 +17,7 @@
     rf"^~=\s*(?P<version>{VERSION_PATTERN})$", re.VERBOSE | re.IGNORECASE
 )
 X_CONSTRAINT = re.compile(
-    r"^(?P<op>!=|==)?\s*v?(?P<version>(\d+)(?:\.(\d+))?(?:\.(\d+))?)(?:\.[xX*])+$"
+    r"^(?P<op>!=|==)?\s*v?(?P<version>(\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
@@ -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(