Skip to content

simplify extra markers #842

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
radoering merged 1 commit into from
Feb 23, 2025
Merged

simplify extra markers #842

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
24 changes: 17 additions & 7 deletions src/poetry/core/constraints/generic/union_constraint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,26 @@ def intersect(self, other: BaseConstraint) -> BaseConstraint:
other = UnionConstraint(other)

new_constraints = []
seen_multi_constraints = set()

def add_unseen_constraint(constraint: BaseConstraint) -> None:
if not (
constraint.is_empty()
or constraint in new_constraints
or (
isinstance(constraint, MultiConstraint)
and frozenset(constraint.constraints) in seen_multi_constraints
)
):
new_constraints.append(constraint)
if isinstance(constraint, MultiConstraint):
seen_multi_constraints.add(frozenset(constraint.constraints))

if isinstance(other, UnionConstraint):
# (A or B) and (C or D) => (A and C) or (A and D) or (B and C) or (B and D)
for our_constraint in self._constraints:
for their_constraint in other.constraints:
intersection = our_constraint.intersect(their_constraint)

if not (intersection.is_empty() or intersection in new_constraints):
new_constraints.append(intersection)
add_unseen_constraint(our_constraint.intersect(their_constraint))

else:
assert isinstance(other, MultiConstraint)
Expand All @@ -94,9 +106,7 @@ def intersect(self, other: BaseConstraint) -> BaseConstraint:
intersection = our_constraint
for their_constraint in other.constraints:
intersection = intersection.intersect(their_constraint)

if not (intersection.is_empty() or intersection in new_constraints):
new_constraints.append(intersection)
add_unseen_constraint(intersection)

if not new_constraints:
return EmptyConstraint()
Expand Down
5 changes: 5 additions & 0 deletions tests/constraints/generic/test_constraint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,6 +920,11 @@ def test_intersect(
UnionConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
EmptyConstraint(),
),
(
ExtraMultiConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
UnionConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
ExtraMultiConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
),
],
)
def test_intersect_extra(
Expand Down
10 changes: 10 additions & 0 deletions tests/version/test_markers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,16 @@ def test_single_marker_not_in_python_intersection() -> None:
'extra == "a" or extra == "c"',
'extra == "c" and extra != "a" and extra != "b"',
),
(
'extra == "a" and extra == "b"',
'extra == "a" or extra == "b"',
'extra == "a" and extra == "b"',
),
(
'extra == "a" or extra == "b"',
'extra == "a" and extra == "b"',
'extra == "a" and extra == "b"',
),
],
)
def test_single_marker_intersect_extras(
Expand Down