Skip to content

Commit 33eed99

Browse files
committed
pr feedback: remove redundant filtering and test fixture, improve solver test
1 parent b446675 commit 33eed99

File tree

3 files changed

+6
-36
lines changed

3 files changed

+6
-36
lines changed

src/poetry/puzzle/provider.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -462,16 +462,7 @@ def incompatibilities_for(
462462
for dep in dependencies
463463
if dep.name not in self.UNSAFE_PACKAGES
464464
and self._python_constraint.allows_any(dep.python_constraint)
465-
and (
466-
not self._env
467-
or dep.marker.validate(
468-
self._marker_values(
469-
self._active_root_extras
470-
if dependency_package.package.is_root()
471-
else dependency_package.dependency.extras
472-
)
473-
)
474-
)
465+
and (not self._env or dep.marker.validate(self._env.marker_env))
475466
]
476467
dependencies = self._get_dependencies_with_overrides(_dependencies, package)
477468

tests/installation/fixtures/with-conflicting-dependencies-root-extras.test

Lines changed: 0 additions & 24 deletions
This file was deleted.

tests/puzzle/test_solver.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4792,8 +4792,11 @@ def test_solver_resolves_duplicate_dependency_in_root_extra(
47924792
repo.add_package(package_a1)
47934793
repo.add_package(package_a2)
47944794

4795-
solver = Solver(package, pool, [], [], io, active_root_extras=extra)
4796-
transaction = solver.solve()
4795+
solver = Solver(
4796+
package, pool, [], [package_a1, package_a2], io, active_root_extras=extra
4797+
)
4798+
with solver.use_environment(MockEnv()):
4799+
transaction = solver.solve()
47974800

47984801
check_solver_result(
47994802
transaction,

0 commit comments

Comments
 (0)