provider: ensure ony activated extras are used

Resolves: python-poetry#3022
abn · Oct 2, 2020 · 83db64d · 83db64d
1 parent 7c15b98
commit 83db64d
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 7 deletions.
diff --git a/poetry/puzzle/provider.py b/poetry/puzzle/provider.py
@@ -432,7 +432,7 @@ def complete_package(
                 self._pool.package(
                     package.name,
                     package.version.text,
-                    extras=package.dependency.extras,
+                    extras=list(package.dependency.extras),
                     repository=package.dependency.source_name,
                 ),
             )
@@ -478,12 +478,11 @@ def complete_package(
             if self._env and not dep.marker.validate(self._env.marker_env):
                 continue
 
-            if (
-                dep.is_optional()
-                and dep.name not in optional_dependencies
-                and not package.is_root()
-            ):
-                continue
+            if not package.is_root():
+                if (
+                    dep.is_optional() and dep.name not in optional_dependencies
+                ) or not set(dep.in_extras).issubset(package.dependency.extras):
+                    continue
 
             _dependencies.append(dep)
 

diff --git a/tests/puzzle/test_solver.py b/tests/puzzle/test_solver.py
@@ -449,6 +449,54 @@ def test_solver_returns_extras_if_requested(solver, repo, package):
     assert ops[0].package.marker.is_any()
 
 
+@pytest.mark.parametrize(("enabled_extra",), [("one",), ("two",)])
+def test_solver_returns_extras_only_requested(solver, repo, package, enabled_extra):
+    package.add_dependency(Factory.create_dependency("A", "*"))
+    package.add_dependency(
+        Factory.create_dependency("B", {"version": "*", "extras": [enabled_extra]})
+    )
+
+    package_a = get_package("A", "1.0")
+    package_b = get_package("B", "1.0")
+    package_c10 = get_package("C", "1.0")
+    package_c20 = get_package("C", "2.0")
+
+    dep10 = get_dependency("C", "1.0", optional=True)
+    dep10._in_extras.append("one")
+    dep10.marker = parse_marker("extra == 'one'")
+
+    dep20 = get_dependency("C", "2.0", optional=True)
+    dep20._in_extras.append("two")
+    dep20.marker = parse_marker("extra == 'two'")
+
+    package_b.extras = {"one": [dep10], "two": [dep20]}
+
+    package_b.requires.append(dep10)
+    package_b.requires.append(dep20)
+
+    repo.add_package(package_a)
+    repo.add_package(package_b)
+    repo.add_package(package_c10)
+    repo.add_package(package_c20)
+
+    ops = solver.solve()
+
+    check_solver_result(
+        ops,
+        [
+            {
+                "job": "install",
+                "package": package_c10 if enabled_extra == "one" else package_c20,
+            },
+            {"job": "install", "package": package_a},
+            {"job": "install", "package": package_b},
+        ],
+    )
+
+    assert ops[-1].package.marker.is_any()
+    assert ops[0].package.marker.is_any()
+
+
 def test_solver_returns_prereleases_if_requested(solver, repo, package):
     package.add_dependency(Factory.create_dependency("A", "*"))
     package.add_dependency(Factory.create_dependency("B", "*"))