更改enroll命名,添加了注释,向get_error_msg中添加了一些错误代码

venv/Lib/site-packages/pip/_internal/operations/build/metadata.py

@@ -6,17 +6,11 @@ import os
 from pip._vendor.pep517.wrappers import Pep517HookCaller
 
 from pip._internal.build_env import BuildEnvironment
-from pip._internal.exceptions import (
-    InstallationSubprocessError,
-    MetadataGenerationFailed,
-)
 from pip._internal.utils.subprocess import runner_with_spinner_message
 from pip._internal.utils.temp_dir import TempDirectory
 
 
-def generate_metadata(
-    build_env: BuildEnvironment, backend: Pep517HookCaller, details: str
-) -> str:
+def generate_metadata(build_env: BuildEnvironment, backend: Pep517HookCaller) -> str:
     """Generate metadata using mechanisms described in PEP 517.
 
     Returns the generated metadata directory.
@@ -31,9 +25,6 @@ def generate_metadata(
         # consider the possibility that this hook doesn't exist.
         runner = runner_with_spinner_message("Preparing metadata (pyproject.toml)")
         with backend.subprocess_runner(runner):
-            try:
-                distinfo_dir = backend.prepare_metadata_for_build_wheel(metadata_dir)
-            except InstallationSubprocessError as error:
-                raise MetadataGenerationFailed(package_details=details) from error
+            distinfo_dir = backend.prepare_metadata_for_build_wheel(metadata_dir)
 
     return os.path.join(metadata_dir, distinfo_dir)

venv/Lib/site-packages/pip/_internal/operations/build/metadata_editable.py

@@ -6,16 +6,12 @@ import os
 from pip._vendor.pep517.wrappers import Pep517HookCaller
 
 from pip._internal.build_env import BuildEnvironment
-from pip._internal.exceptions import (
-    InstallationSubprocessError,
-    MetadataGenerationFailed,
-)
 from pip._internal.utils.subprocess import runner_with_spinner_message
 from pip._internal.utils.temp_dir import TempDirectory
 
 
 def generate_editable_metadata(
-    build_env: BuildEnvironment, backend: Pep517HookCaller, details: str
+    build_env: BuildEnvironment, backend: Pep517HookCaller
 ) -> str:
     """Generate metadata using mechanisms described in PEP 660.
 
@@ -33,9 +29,6 @@ def generate_editable_metadata(
             "Preparing editable metadata (pyproject.toml)"
         )
         with backend.subprocess_runner(runner):
-            try:
-                distinfo_dir = backend.prepare_metadata_for_build_editable(metadata_dir)
-            except InstallationSubprocessError as error:
-                raise MetadataGenerationFailed(package_details=details) from error
+            distinfo_dir = backend.prepare_metadata_for_build_editable(metadata_dir)
 
     return os.path.join(metadata_dir, distinfo_dir)

venv/Lib/site-packages/pip/_internal/operations/build/metadata_legacy.py

@@ -6,11 +6,7 @@ import os
 
 from pip._internal.build_env import BuildEnvironment
 from pip._internal.cli.spinners import open_spinner
-from pip._internal.exceptions import (
-    InstallationError,
-    InstallationSubprocessError,
-    MetadataGenerationFailed,
-)
+from pip._internal.exceptions import InstallationError
 from pip._internal.utils.setuptools_build import make_setuptools_egg_info_args
 from pip._internal.utils.subprocess import call_subprocess
 from pip._internal.utils.temp_dir import TempDirectory
@@ -60,15 +56,12 @@ def generate_metadata(
 
     with build_env:
         with open_spinner("Preparing metadata (setup.py)") as spinner:
-            try:
-                call_subprocess(
-                    args,
-                    cwd=source_dir,
-                    command_desc="python setup.py egg_info",
-                    spinner=spinner,
-                )
-            except InstallationSubprocessError as error:
-                raise MetadataGenerationFailed(package_details=details) from error
+            call_subprocess(
+                args,
+                cwd=source_dir,
+                command_desc="python setup.py egg_info",
+                spinner=spinner,
+            )
 
     # Return the .egg-info directory.
     return _find_egg_info(egg_info_dir)

venv/Lib/site-packages/pip/_internal/operations/build/wheel_legacy.py

@@ -4,7 +4,11 @@ from typing import List, Optional
 
 from pip._internal.cli.spinners import open_spinner
 from pip._internal.utils.setuptools_build import make_setuptools_bdist_wheel_args
-from pip._internal.utils.subprocess import call_subprocess, format_command_args
+from pip._internal.utils.subprocess import (
+    LOG_DIVIDER,
+    call_subprocess,
+    format_command_args,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -24,7 +28,7 @@ def format_command_result(
     else:
         if not command_output.endswith("\n"):
             command_output += "\n"
-        text += f"Command output:\n{command_output}"
+        text += f"Command output:\n{command_output}{LOG_DIVIDER}"
 
     return text
 
@@ -82,7 +86,6 @@ def build_wheel_legacy(
         try:
             output = call_subprocess(
                 wheel_args,
-                command_desc="python setup.py bdist_wheel",
                 cwd=source_dir,
                 spinner=spinner,
             )

venv/Lib/site-packages/pip/_internal/operations/install/editable_legacy.py

@@ -42,6 +42,5 @@ def install_editable(
         with build_env:
             call_subprocess(
                 args,
-                command_desc="python setup.py develop",
                 cwd=unpacked_source_directory,
             )

venv/Lib/site-packages/pip/_internal/operations/install/legacy.py

@@ -7,8 +7,9 @@ from distutils.util import change_root
 from typing import List, Optional, Sequence
 
 from pip._internal.build_env import BuildEnvironment
-from pip._internal.exceptions import InstallationError, LegacyInstallFailure
+from pip._internal.exceptions import InstallationError
 from pip._internal.models.scheme import Scheme
+from pip._internal.utils.logging import indent_log
 from pip._internal.utils.misc import ensure_dir
 from pip._internal.utils.setuptools_build import make_setuptools_install_args
 from pip._internal.utils.subprocess import runner_with_spinner_message
@@ -17,6 +18,10 @@ from pip._internal.utils.temp_dir import TempDirectory
 logger = logging.getLogger(__name__)
 
 
+class LegacyInstallFailure(Exception):
+    pass
+
+
 def write_installed_files_from_setuptools_record(
     record_lines: List[str],
     root: Optional[str],
@@ -93,7 +98,7 @@ def install(
             runner = runner_with_spinner_message(
                 f"Running setup.py install for {req_name}"
             )
-            with build_env:
+            with indent_log(), build_env:
                 runner(
                     cmd=install_args,
                     cwd=unpacked_source_directory,
@@ -106,7 +111,7 @@ def install(
 
         except Exception as e:
             # Signal to the caller that we didn't install the new package
-            raise LegacyInstallFailure(package_details=req_name) from e
+            raise LegacyInstallFailure from e
 
         # At this point, we have successfully installed the requirement.
 

venv/Lib/site-packages/pip/_internal/operations/prepare.py

@@ -59,10 +59,10 @@ def _get_prepared_distribution(
     return abstract_dist.get_metadata_distribution()
 
 
-def unpack_vcs_link(link: Link, location: str, verbosity: int) -> None:
+def unpack_vcs_link(link: Link, location: str) -> None:
     vcs_backend = vcs.get_backend_for_scheme(link.scheme)
     assert vcs_backend is not None
-    vcs_backend.unpack(location, url=hide_url(link.url), verbosity=verbosity)
+    vcs_backend.unpack(location, url=hide_url(link.url))
 
 
 class File:
@@ -175,7 +175,6 @@ def unpack_url(
     link: Link,
     location: str,
     download: Downloader,
-    verbosity: int,
     download_dir: Optional[str] = None,
     hashes: Optional[Hashes] = None,
 ) -> Optional[File]:
@@ -188,7 +187,7 @@ def unpack_url(
     """
     # non-editable vcs urls
     if link.is_vcs:
-        unpack_vcs_link(link, location, verbosity=verbosity)
+        unpack_vcs_link(link, location)
         return None
 
     # Once out-of-tree-builds are no longer supported, could potentially
@@ -268,7 +267,6 @@ class RequirementPreparer:
         require_hashes: bool,
         use_user_site: bool,
         lazy_wheel: bool,
-        verbosity: int,
         in_tree_build: bool,
     ) -> None:
         super().__init__()
@@ -297,9 +295,6 @@ class RequirementPreparer:
         # Should wheels be downloaded lazily?
         self.use_lazy_wheel = lazy_wheel
 
-        # How verbose should underlying tooling be?
-        self.verbosity = verbosity
-
         # Should in-tree builds be used for local paths?
         self.in_tree_build = in_tree_build
 
@@ -530,12 +525,7 @@ class RequirementPreparer:
         elif link.url not in self._downloaded:
             try:
                 local_file = unpack_url(
-                    link,
-                    req.source_dir,
-                    self._download,
-                    self.verbosity,
-                    self.download_dir,
-                    hashes,
+                    link, req.source_dir, self._download, self.download_dir, hashes
                 )
             except NetworkConnectionError as exc:
                 raise InstallationError(