Skip to content

Marker name is a string, not a lexer token #286

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

Merged
finswimmer merged 2 commits into from
Feb 26, 2022
Merged

Marker name is a string, not a lexer token #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
135efc5
Marker name is a string, not a lexer token
dimbleby Feb 6, 2022
f2382c9
add unit test
dimbleby Feb 11, 2022
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
4 changes: 3 additions & 1 deletion src/poetry/core/version/markers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,9 @@ def _compact_markers(tree_elements: "Tree", tree_prefix: str = "") -> MarkerType
)

value = value[1:-1]
groups[-1] = MultiMarker.of(groups[-1], SingleMarker(name, f"{op}{value}"))
groups[-1] = MultiMarker.of(
groups[-1], SingleMarker(str(name), f"{op}{value}")
)
elif token.data == f"{tree_prefix}BOOL_OP" and token.children[0] == "or":
groups.append(MultiMarker())

Expand Down
7 changes: 7 additions & 0 deletions tests/packages/test_dependency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,3 +298,10 @@ def test_marker_properly_sets_python_constraint():
dependency.marker = 'python_version >= "3.6" and python_version < "4.0"'

assert str(dependency.python_constraint) == ">=3.6,<4.0"


def test_dependency_markers_are_the_same_as_markers():
dependency = Dependency.create_from_pep_508('foo ; extra=="bar"')
marker = parse_marker('extra=="bar"')

assert dependency.marker == marker