Skip to content
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

Jump to bottom

Simplify marker simplification #530

Merged
merged 7 commits into from
Dec 18, 2022
Merged

Simplify marker simplification #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1e73477
simplify marker simplification
dimbleby Nov 27, 2022
9cb4ade
code review
dimbleby Nov 27, 2022
2b85704
further simplification
dimbleby Nov 29, 2022
8bf5787
simplify markers fully in _compact_markers
dimbleby Nov 29, 2022
2b1d652
Deduplicate during `_flatten_markers()`
dimbleby Dec 11, 2022
dea4676
add tests for cnf
radoering Dec 17, 2022
744e720
add intersection and union function, which take an arbitrary amount o…
radoering Dec 17, 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: 2 additions & 2 deletions src/poetry/core/packages/utils/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ def add_constraint(
for i, sub_marker in enumerate(conjunctions):
if isinstance(sub_marker, MultiMarker):
for m in sub_marker.markers:
if isinstance(m, SingleMarker):
add_constraint(m.name, (m.operator, m.value), i)
assert isinstance(m, SingleMarker)
add_constraint(m.name, (m.operator, m.value), i)
elif isinstance(sub_marker, SingleMarker):
add_constraint(sub_marker.name, (sub_marker.operator, sub_marker.value), i)

Expand Down
Loading