Merge pull request #7522 from pradyunsg/refactor/move-pep517-wheel-build-process

Move PEP-517 wheel build logic into operations.build

Author: pradyunsg

src/pip/_internal/operations/build/wheel.py

@@ -0,0 +1,46 @@
+import logging
+import os
+
+from pip._internal.utils.subprocess import runner_with_spinner_message
+from pip._internal.utils.typing import MYPY_CHECK_RUNNING
+
+if MYPY_CHECK_RUNNING:
+    from typing import List, Optional
+    from pip._vendor.pep517.wrappers import Pep517HookCaller
+
+logger = logging.getLogger(__name__)
+
+
+def build_wheel_pep517(
+    name,  # type: str
+    backend,  # type: Pep517HookCaller
+    metadata_directory,  # type: str
+    build_options,  # type: List[str]
+    tempd,  # type: str
+):
+    # type: (...) -> Optional[str]
+    """Build one InstallRequirement using the PEP 517 build process.
+
+    Returns path to wheel if successfully built. Otherwise, returns None.
+    """
+    assert metadata_directory is not None
+    if build_options:
+        # PEP 517 does not support --build-options
+        logger.error('Cannot build wheel for %s using PEP 517 when '
+                     '--build-option is present' % (name,))
+        return None
+    try:
+        logger.debug('Destination directory: %s', tempd)
+
+        runner = runner_with_spinner_message(
+            'Building wheel for {} (PEP 517)'.format(name)
+        )
+        with backend.subprocess_runner(runner):
+            wheel_name = backend.build_wheel(
+                tempd,
+                metadata_directory=metadata_directory,
+            )
+    except Exception:
+        logger.error('Failed building wheel for %s', name)
+        return None
+    return os.path.join(tempd, wheel_name)

src/pip/_internal/wheel_builder.py

@@ -10,15 +10,13 @@
 import shutil
 
 from pip._internal.models.link import Link
+from pip._internal.operations.build.wheel import build_wheel_pep517
 from pip._internal.operations.build.wheel_legacy import build_wheel_legacy
 from pip._internal.utils.logging import indent_log
 from pip._internal.utils.marker_files import has_delete_marker_file
 from pip._internal.utils.misc import ensure_dir, hash_file
 from pip._internal.utils.setuptools_build import make_setuptools_clean_args
-from pip._internal.utils.subprocess import (
-    call_subprocess,
-    runner_with_spinner_message,
-)
+from pip._internal.utils.subprocess import call_subprocess
 from pip._internal.utils.temp_dir import TempDirectory
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
 from pip._internal.utils.unpacking import unpack_file
@@ -35,7 +33,6 @@
         RequirementPreparer
     )
     from pip._internal.req.req_install import InstallRequirement
-    from pip._vendor.pep517.wrappers import Pep517HookCaller
 
     BinaryAllowedPredicate = Callable[[InstallRequirement], bool]
     BuildResult = Tuple[List[InstallRequirement], List[InstallRequirement]]
@@ -127,41 +124,6 @@ def should_cache(
     return False
 
 
-def _build_wheel_pep517(
-    name,  # type: str
-    backend,  # type: Pep517HookCaller
-    metadata_directory,  # type: str
-    build_options,  # type: List[str]
-    tempd,  # type: str
-):
-    # type: (...) -> Optional[str]
-    """Build one InstallRequirement using the PEP 517 build process.
-
-    Returns path to wheel if successfully built. Otherwise, returns None.
-    """
-    assert metadata_directory is not None
-    if build_options:
-        # PEP 517 does not support --build-options
-        logger.error('Cannot build wheel for %s using PEP 517 when '
-                     '--build-option is present' % (name,))
-        return None
-    try:
-        logger.debug('Destination directory: %s', tempd)
-
-        runner = runner_with_spinner_message(
-            'Building wheel for {} (PEP 517)'.format(name)
-        )
-        with backend.subprocess_runner(runner):
-            wheel_name = backend.build_wheel(
-                tempd,
-                metadata_directory=metadata_directory,
-            )
-    except Exception:
-        logger.error('Failed building wheel for %s', name)
-        return None
-    return os.path.join(tempd, wheel_name)
-
-
 def _collect_buildset(
     requirements,  # type: Iterable[InstallRequirement]
     wheel_cache,  # type: WheelCache
@@ -252,7 +214,7 @@ def _build_one_inside_env(
         # type: (...) -> Optional[str]
         with TempDirectory(kind="wheel") as temp_dir:
             if req.use_pep517:
-                wheel_path = _build_wheel_pep517(
+                wheel_path = build_wheel_pep517(
                     name=req.name,
                     backend=req.pep517_backend,
                     metadata_directory=req.metadata_directory,