constraints: allow whitespace padding in caret constraints (for consi…

…stency) and consolidate `parse_constraint` tests (#606)
python-poetry · Jun 18, 2023 · 0749c55 · 0749c55
1 parent 2bba11c
commit 0749c55
Show file tree

Hide file tree

Showing 3 changed files with 113 additions and 216 deletions.
diff --git a/src/poetry/core/constraints/version/parser.py b/src/poetry/core/constraints/version/parser.py
@@ -38,7 +38,7 @@ def _parse_constraint(
         # standard-compliant it seems to occur in some packages)
         constraints = constraints.rstrip(",").rstrip()
         and_constraints = re.split(
-            "(?<!^)(?<![~=>< ,]) *(?<!-)[, ](?!-) *(?!,|$)", constraints
+            r"(?<!^)(?<![\^~=>< ,]) *(?<!-)[, ](?!-) *(?!,|$)", constraints
         )
         constraint_objects = []
 

diff --git a/src/poetry/core/constraints/version/patterns.py b/src/poetry/core/constraints/version/patterns.py
@@ -8,7 +8,7 @@
 COMPLETE_VERSION = re.compile(VERSION_PATTERN, re.VERBOSE | re.IGNORECASE)
 
 CARET_CONSTRAINT = re.compile(
-    rf"^\^(?P<version>{VERSION_PATTERN})$", re.VERBOSE | re.IGNORECASE
+    rf"^\^\s*(?P<version>{VERSION_PATTERN})$", re.VERBOSE | re.IGNORECASE
 )
 TILDE_CONSTRAINT = re.compile(
     rf"^~(?!=)\s*(?P<version>{VERSION_PATTERN})$", re.VERBOSE | re.IGNORECASE