Skip to content

fix(markers): when left hand value is non-version string, fallback to python behavior #889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
frostming wants to merge 1 commit into from
Closed

fix(markers): when left hand value is non-version string, fallback to python behavior #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/packaging/markers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from ._tokenizer import ParserSyntaxError
from .specifiers import InvalidSpecifier, Specifier
from .utils import canonicalize_name
from .version import InvalidVersion

__all__ = [
"InvalidMarker",
Expand Down Expand Up @@ -180,7 +181,10 @@ def _eval_op(lhs: str, op: Op, rhs: str) -> bool:
except InvalidSpecifier:
pass
else:
return spec.contains(lhs, prereleases=True)
try:
return spec.contains(lhs, prereleases=True)
except InvalidVersion:
pass

oper: Operator | None = _operators.get(op.serialize())
if oper is None:
Expand Down
1 change: 1 addition & 0 deletions tests/test_markers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ def test_environment_with_extra_none(self):
{"os_name": "other", "python_version": "2.7.4"},
False,
),
("platform_release >= '6'", {"platform_release": "6.1-foobar"}, True),
("extra == 'security'", {"extra": "quux"}, False),
("extra == 'security'", {"extra": "security"}, True),
("extra == 'SECURITY'", {"extra": "security"}, True),
Expand Down
Loading