Merge pull request #11112 from pradyunsg/filter-out-build-env-extras

Filter out build requirements that require an extra to be used
pypa · May 12, 2022 · 0a982f6 · 0a982f6
2 parents d0c89a1 + bf090d3
commit 0a982f6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/news/11112.bugfix.rst b/news/11112.bugfix.rst
@@ -0,0 +1 @@
+Properly filter out optional dependencies (i.e. extras) when checking build environment distributions.
diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py
@@ -175,8 +175,10 @@ def check_requirements(
             )
             for req_str in reqs:
                 req = Requirement(req_str)
-                if req.marker is not None and not req.marker.evaluate():
-                    continue  # FIXME: Consider extras?
+                # We're explicitly evaluating with an empty extra value, since build
+                # environments are not provided any mechanism to select specific extras.
+                if req.marker is not None and not req.marker.evaluate({"extra": ""}):
+                    continue
                 dist = env.get_distribution(req.name)
                 if not dist:
                     missing.add(req_str)

diff --git a/tests/functional/test_build_env.py b/tests/functional/test_build_env.py
@@ -178,6 +178,7 @@ def test_build_env_requirements_check(script: PipTestEnvironment) -> None:
             [
                 "bar==2.0; python_version < '3.0'",
                 "bar==3.0; python_version >= '3.0'",
+                "foo==4.0; extra == 'dev'",
             ],
         )
         assert r == (set(), set()), repr(r)