Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/packaging/markers.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,21 @@ def _eval_op(lhs: str, op: Op, rhs: str | AbstractSet[str], *, key: str) -> bool
return oper(lhs, rhs)


def _swap_op(op: Op) -> Op:
swapped = {
"<": ">",
"<=": ">=",
">": "<",
">=": "<=",
"==": "==",
"!=": "!=",
"~=": "~=",
}.get(op.serialize())
if swapped is None:
return op
return Op(swapped)


def _normalize(
lhs: str, rhs: str | AbstractSet[str], key: str
) -> tuple[str, str | AbstractSet[str]]:
Expand Down Expand Up @@ -271,6 +286,18 @@ def _evaluate_markers(
environment_key = rhs.value
rhs_value = environment[environment_key]

if environment_key in MARKERS_REQUIRING_VERSION and op.serialize() in {
"<",
"<=",
"==",
"!=",
">=",
">",
"~=",
}:
lhs_value, rhs_value = rhs_value, lhs_value
op = _swap_op(op)

assert isinstance(lhs_value, str), "lhs must be a string"
lhs_value, rhs_value = _normalize(lhs_value, rhs_value, key=environment_key)
groups[-1].append(_eval_op(lhs_value, op, rhs_value, key=environment_key))
Expand Down
14 changes: 13 additions & 1 deletion tests/test_markers.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@

import pytest

from packaging._parser import Node
from packaging._parser import Node, Op
from packaging.markers import (
InvalidMarker,
Marker,
UndefinedComparison,
_swap_op,
default_environment,
format_full_version,
)
Expand Down Expand Up @@ -86,6 +87,12 @@ def test_prefers_pep440(self) -> None:
dict(python_full_version="2.7.8")
)

def test_rhs_version_variable_uses_equivalent_pep440_comparison(self) -> None:
env = {"python_full_version": "3.13.7"}

assert Marker('python_full_version == "3.13.*"').evaluate(env)
assert Marker('"3.13.*" == python_full_version').evaluate(env)

def test_new_string_rules(self) -> None:
assert not Marker('"b" < python_full_version').evaluate(
dict(python_full_version="c")
Expand All @@ -109,6 +116,11 @@ def test_allows_prerelease(self) -> None:
)


def test_swap_op_unknown_operator_passthrough() -> None:
op = Op("===")
assert _swap_op(op) is op


class FakeVersionInfo(NamedTuple):
major: int
minor: int
Expand Down
Loading