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.

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

Solver fixes #5305

Merged
merged 1 commit into from
Mar 20, 2022
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
2 changes: 1 addition & 1 deletion src/poetry/puzzle/solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def reachable(self) -> list[PackageNode]:
and dependency.constraint.allows(pkg.version.stable)
)
and not any(
child.package.name == pkg.name
child.package.complete_name == pkg.complete_name
and child.groups == dependency.groups
for child in children
)
Expand Down
47 changes: 47 additions & 0 deletions tests/puzzle/test_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,53 @@ def test_solver_returns_extras_only_requested_nested(
assert ops[0].package.marker.is_any()


def test_solver_finds_extras_next_to_non_extras(
solver: Solver, repo: Repository, package: ProjectPackage
):
# Root depends on A[foo]
package.add_dependency(
Factory.create_dependency("A", {"version": "*", "extras": ["foo"]})
)

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

# A depends on B; A[foo] depends on B[bar].
package_a.add_dependency(Factory.create_dependency("B", "*"))
package_a.add_dependency(
Factory.create_dependency(
"B", {"version": "*", "extras": ["bar"], "markers": "extra == 'foo'"}
)
)
package_a.extras = {"foo": [get_dependency("B", "*")]}

# B depends on C; B[bar] depends on D.
package_b.add_dependency(Factory.create_dependency("C", "*"))
package_b.add_dependency(
Factory.create_dependency("D", {"version": "*", "markers": 'extra == "bar"'})
)
package_b.extras = {"bar": [get_dependency("D", "*")]}

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

transaction = solver.solve()

check_solver_result(
transaction,
[
{"job": "install", "package": package_c},
{"job": "install", "package": package_d},
{"job": "install", "package": package_b},
{"job": "install", "package": package_a},
],
)


def test_solver_returns_prereleases_if_requested(
solver: Solver, repo: Repository, package: ProjectPackage
):
Expand Down