Addressing invert and __str__

Author: npapapietro

src/poetry/core/constraints/generic/parser.py

@@ -16,6 +16,7 @@
 
 
 BASIC_CONSTRAINT = re.compile(r"^(!?==?)?\s*([^\s]+?)\s*$")
+STR_CMP_CONSTRAINT = re.compile(r"^(?P<op>(in|not in))(?P<value>(.*))$")
 
 
 @functools.lru_cache(maxsize=None)
@@ -27,7 +28,7 @@ def parse_constraint(constraints: str) -> BaseConstraint:
     or_groups = []
     for constraints in or_constraints:
         and_constraints = re.split(
-            r"(?<!^)(?<![=>< ,]) *(?<!-)[, ](?!-) *(?!,|$)", constraints
+            r"(?<!^)(?<![=>< ,(in|not in)]) *(?<!-)[, ](?!-) *(?!,|$)", constraints
         )
         constraint_objects = []
 
@@ -53,9 +54,13 @@ def parse_constraint(constraints: str) -> BaseConstraint:
 
 
 def parse_single_constraint(constraint: str) -> Constraint:
+    if m := STR_CMP_CONSTRAINT.match(constraint):
+        op = m.group("op")
+        value = m.group("value").strip()
+        return Constraint(value, op)
+
     # Basic comparator
-    m = BASIC_CONSTRAINT.match(constraint)
-    if m:
+    if m := BASIC_CONSTRAINT.match(constraint):
         op = m.group(1)
         if op is None:
             op = "=="

src/poetry/core/version/markers.py

@@ -336,6 +336,7 @@ def __init__(
         parser: Callable[[str], BaseConstraint | VersionConstraint]
         original_constraint_string = constraint_string = str(constraint)
 
+        self._str_cmp = str_cmp
         # Extract operator and value
         m = self._CONSTRAINT_RE.match(constraint_string)
         if m is None:
@@ -348,9 +349,11 @@ def __init__(
         self._value = m.group(2)
         parser = parse_generic_constraint
 
-        if name in self._VERSION_LIKE_MARKER_NAME and not (
-            name == "platform_release" and str_cmp
-        ):
+        # platform_release has non-version constraints
+        # when string comparison flag is set
+        if name == "platform_release" and str_cmp:
+            pass
+        elif name in self._VERSION_LIKE_MARKER_NAME:
             parser = parse_marker_version_constraint
 
             if self._operator in {"in", "not in"}:
@@ -441,8 +444,10 @@ def invert(self) -> BaseMarker:
         else:
             # We should never go there
             raise RuntimeError(f"Invalid marker operator '{self._operator}'")
-
-        return parse_marker(f"{self._name} {operator} '{self._value}'")
+        constraint = f"{self._name} {operator} '{self._value}'"
+        if self._str_cmp:
+            constraint = f'"{self._value}" {operator} {self._name}'
+        return parse_marker(constraint)
 
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, SingleMarker):
@@ -454,6 +459,8 @@ def __hash__(self) -> int:
         return hash(self._key)
 
     def __str__(self) -> str:
+        if self._str_cmp:
+            return f'"{self._value}" {self._operator} {self._name}'
         return f'{self._name} {self._operator} "{self._value}"'
 
     def validate(self, environment: dict[str, Any] | None) -> bool:

tests/version/test_markers.py

@@ -924,6 +924,11 @@ def test_multi_marker_removes_duplicates() -> None:
             False,
         ),
         ('"tegra" not in platform_release', {"platform_release": "5.10.120"}, True),
+        (
+            "platform_machine == 'aarch64' and 'tegra' in platform_release",
+            {"platform_release": "5.10.120-tegra", "platform_machine": "aarch64"},
+            True,
+        ),
         (
             "platform_release != '4.9.253-tegra'",
             {"platform_release": "4.9.254-tegra"},