Skip to content

simplify extra markers 3 #847

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
merged 1 commit into from
Mar 13, 2025
Merged

simplify extra markers 3 #847

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/poetry/core/constraints/generic/multi_constraint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,12 @@ def union(self, other: BaseConstraint) -> BaseConstraint:
from poetry.core.constraints.generic import UnionConstraint

if isinstance(other, MultiConstraint):
if set(other.constraints) == set(self._constraints):
our_constraints = set(self._constraints)
their_constraints = set(other.constraints)
if our_constraints.issubset(their_constraints):
return self
if their_constraints.issubset(our_constraints):
return other
return UnionConstraint(self, other)

if isinstance(other, Constraint):
Expand Down
12 changes: 11 additions & 1 deletion 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 @@ -93,6 +93,16 @@ def add_unseen_constraint(constraint: BaseConstraint) -> None:
seen_multi_constraints.add(frozenset(constraint.constraints))

if isinstance(other, UnionConstraint):
# (A or B) and (A or B or C) => A or B
our_constraints = set(self._constraints)
their_constraints = set(other.constraints)
if our_constraints.issubset(their_constraints):
return self
if their_constraints.issubset(our_constraints):
if len(other.constraints) == 1:
return other.constraints[0]
return other

# (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:
Expand All @@ -101,7 +111,7 @@ def add_unseen_constraint(constraint: BaseConstraint) -> None:
else:
assert isinstance(other, MultiConstraint)
# (A or B) and (C and D) => (A and C and D) or (B and C and D)

# (A or B) and (A and D) => A and D
for our_constraint in self._constraints:
intersection = our_constraint
for their_constraint in other.constraints:
Expand Down
18 changes: 18 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 @@ -810,6 +810,15 @@ def test_intersect(
UnionConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
UnionConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
),
(
UnionConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
UnionConstraint(
ExtraConstraint("extra1"),
ExtraConstraint("extra2"),
ExtraConstraint("extra3"),
),
UnionConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
),
(
UnionConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
UnionConstraint(ExtraConstraint("extra2"), ExtraConstraint("extra1")),
Expand Down Expand Up @@ -1532,6 +1541,15 @@ def test_union(
ExtraMultiConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
ExtraMultiConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
),
(
ExtraMultiConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
ExtraMultiConstraint(
ExtraConstraint("extra1"),
ExtraConstraint("extra2"),
ExtraConstraint("extra3"),
),
ExtraMultiConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
),
(
ExtraMultiConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra2")),
ExtraMultiConstraint(ExtraConstraint("extra1"), ExtraConstraint("extra3")),
Expand Down
40 changes: 40 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 @@ -312,6 +312,16 @@ def test_single_marker_not_in_python_intersection() -> None:
'extra == "b" and extra == "a"',
'extra == "a" and extra == "b"',
),
(
'extra == "a" and extra == "b"',
'extra == "a" and extra == "b" and extra == "c"',
'extra == "a" and extra == "b" and extra == "c"',
),
(
'extra == "a" and extra == "b" and extra == "c" and extra == "d"',
'extra == "a" and extra == "b"',
'extra == "a" and extra == "b" and extra == "c" and extra == "d"',
),
(
'extra == "a" and extra == "b"',
'extra == "c" and extra != "d"',
Expand Down Expand Up @@ -357,6 +367,16 @@ def test_single_marker_not_in_python_intersection() -> None:
'extra == "b" or extra == "a"',
'extra == "a" or extra == "b"',
),
(
'extra == "a" or extra == "b"',
'extra == "a" or extra == "b" or extra == "c"',
'extra == "a" or extra == "b"',
),
(
'extra == "a" or extra == "b" or extra == "c" or extra == "d"',
'extra == "a" or extra == "b"',
'extra == "a" or extra == "b"',
),
(
'extra == "a" or extra == "b"',
'extra == "a" or extra != "c"',
Expand Down Expand Up @@ -612,6 +632,16 @@ def test_single_marker_union_with_inverse() -> None:
'extra == "a" and extra == "b"',
'extra == "a" and extra == "b"',
),
(
'extra == "a" and extra == "b"',
'extra == "a" and extra == "b" and extra == "c"',
'extra == "a" and extra == "b"',
),
(
'extra == "a" and extra == "b" and extra == "c" and extra == "d"',
'extra == "a" and extra == "b"',
'extra == "a" and extra == "b"',
),
(
'extra == "a" and extra == "b"',
'extra == "c" and extra != "d"',
Expand Down Expand Up @@ -668,6 +698,16 @@ def test_single_marker_union_with_inverse() -> None:
'extra == "a" or extra == "b"',
'extra == "a" or extra == "b"',
),
(
'extra == "a" or extra == "b"',
'extra == "a" or extra == "b" or extra == "c"',
'extra == "a" or extra == "b" or extra == "c"',
),
(
'extra == "a" or extra == "b" or extra == "c" or extra == "d"',
'extra == "a" or extra == "b"',
'extra == "a" or extra == "b" or extra == "c" or extra == "d"',
),
(
'extra == "a" or extra == "b"',
'extra == "a" or extra != "c"',
Expand Down