Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/puzzle/provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,9 @@ def complete_package(
for complete_dep_name, deps_by_extra in duplicates_by_extras.items():
if len(deps_by_extra) > 1:
duplicates_by_extras[complete_dep_name] = (
self._resolve_overlapping_markers(package, deps, None)
self._resolve_overlapping_markers(
package, deps_by_extra, None
)
)
if all(len(d) == 1 for d in duplicates_by_extras.values()) and all(
d1[0].marker.intersect(d2[0].marker).is_empty()
Expand Down
43 changes: 43 additions & 0 deletions tests/puzzle/test_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,49 @@ def test_solver_returns_extras_if_requested(
assert ops[0].package.marker.is_any()


@pytest.mark.parametrize("num_groups", [0, 1, 2])
def test_solver_returns_extras_if_requested_in_multiple_groups(
solver: Solver, repo: Repository, package: ProjectPackage, num_groups: int
) -> None:
package.add_dependency(Factory.create_dependency("A", "*"))
package.add_dependency(Factory.create_dependency("B", "*"))
if num_groups:
package.add_dependency(
Factory.create_dependency(
"B",
{"version": "*", "extras": ["foo"]},
groups=[f"group{i}" for i in range(num_groups)],
)
)

package_a = get_package("A", "1.0")
package_b = get_package("B", "1.0")
package_c = get_package("C", "1.0")

dep = get_dependency("C", "^1.0", optional=True)
dep.marker = parse_marker("extra == 'foo'")
package_b.extras = {canonicalize_name("foo"): [dep]}
package_b.add_dependency(dep)

repo.add_package(package_a)
repo.add_package(package_b)
repo.add_package(package_c)

transaction = solver.solve()

expected = [
{"job": "install", "package": package_a},
{"job": "install", "package": package_b},
]
if num_groups:
expected = [{"job": "install", "package": package_c}, *expected]

ops = check_solver_result(transaction, expected)

assert ops[-1].package.marker.is_any()
assert ops[0].package.marker.is_any()


@pytest.mark.parametrize(
("enabled_extras", "expected_packages"),
[
Expand Down