pex 2.59.4__py2.py3-none-any.whl → 2.60.0__py2.py3-none-any.whl

pex/pex_builder.py

@@ -33,11 +33,11 @@ from pex.enum import Enum
 from pex.executables import chmod_plus_x, create_sh_python_redirector_shebang
 from pex.finders import get_entry_point_from_console_script, get_script_from_distributions
 from pex.fs import safe_rename, safe_symlink
+from pex.installed_wheel import InstalledWheel
 from pex.interpreter import PythonInterpreter
 from pex.layout import Layout
 from pex.orderedset import OrderedSet
 from pex.os import WINDOWS
-from pex.pep_376 import InstalledWheel
 from pex.pex import PEX
 from pex.pex_info import PexInfo
 from pex.sh_boot import create_sh_boot_script
@@ -790,9 +790,9 @@ class PEXBuilder(object):
                                 self._chroot.zip(
                                     os.path.join(atomic_zip_dir.work_dir, location),
                                     deterministic=deterministic,
-                                    exclude_file=is_pyc_temporary_file
-                                    if bytecode_compile
-                                    else is_pyc_file,
+                                    exclude_file=(
+                                        is_pyc_temporary_file if bytecode_compile else is_pyc_file
+                                    ),
                                     strip_prefix=os.path.join(pex_info.internal_cache, location),
                                     labels=(location,),
                                     compress=compress,

pex/pex_info.py

@@ -604,9 +604,14 @@ class PexInfo(object):
         data["distributions"] = self._distributions.copy()
         return data
 
-    def dump(self, **extra_json_dumps_kwargs):
-        # type: (**Any) -> str
-        return json.dumps(self.as_json_dict(), sort_keys=True, **extra_json_dumps_kwargs)
+    def dump(self, indent=None):
+        # type: (Optional[int]) -> str
+        return json.dumps(
+            self.as_json_dict(),
+            sort_keys=True,
+            indent=indent,
+            separators=None if indent else (",", ":"),
+        )
 
     def copy(self):
         # type: () -> PexInfo

pex/resolve/venv_resolver.py

@@ -5,6 +5,7 @@ from __future__ import absolute_import
 
 import functools
 import hashlib
+import io
 import itertools
 import os
 from collections import defaultdict, deque
@@ -13,6 +14,7 @@ from pex import pex_warnings
 from pex.atomic_directory import atomic_directory
 from pex.cache.dirs import CacheDir, InstalledWheelDir
 from pex.common import safe_relative_symlink
+from pex.compatibility import PY2, commonpath
 from pex.dependency_configuration import DependencyConfiguration
 from pex.dist_metadata import (
     Constraint,
@@ -24,9 +26,11 @@ from pex.dist_metadata import (
 )
 from pex.exceptions import production_assert, reportable_unexpected_error_msg
 from pex.fingerprinted_distribution import FingerprintedDistribution
+from pex.installed_wheel import InstalledWheel
+from pex.interpreter import PythonInterpreter
 from pex.jobs import DEFAULT_MAX_JOBS, iter_map_parallel
 from pex.orderedset import OrderedSet
-from pex.pep_376 import InstalledWheel
+from pex.pep_376 import Record
 from pex.pep_427 import InstallableType, InstallableWheel, InstallPaths, install_wheel_chroot
 from pex.pep_503 import ProjectName
 from pex.pip.version import PipVersion
@@ -36,10 +40,12 @@ from pex.resolve.requirement_configuration import RequirementConfiguration
 from pex.resolve.resolver_configuration import PipConfiguration
 from pex.resolve.resolvers import ResolvedDistribution, Resolver, ResolveResult
 from pex.result import Error
+from pex.sysconfig import script_name
 from pex.targets import LocalInterpreter, Target, Targets
 from pex.typing import TYPE_CHECKING
 from pex.venv.virtualenv import Virtualenv
 from pex.wheel import Wheel
+from pex.whl import repacked_whl
 
 if TYPE_CHECKING:
     from typing import DefaultDict, Deque, FrozenSet, Iterable, Iterator, List, Mapping, Set, Union
@@ -49,17 +55,71 @@ else:
     import pex.third_party.attr as attr
 
 
+def _normalize_record(
+    distribution,  # type: Distribution
+    install_paths,  # type: InstallPaths
+    record_data,  # type: bytes
+):
+    # type: (...) -> bytes
+
+    entry_map = distribution.get_entry_map()
+    entry_point_scripts = {
+        script_name(entry_point)
+        for key in ("console_scripts", "gui_scripts")
+        for entry_point in entry_map.get(key, {})
+    }
+    if not entry_point_scripts:
+        return record_data
+
+    scripts_dir = os.path.realpath(install_paths.scripts)
+    record_lines = record_data.decode("utf-8").splitlines(True)  # N.B. no kw in 2.7: keepends=True
+    eol = os.sep
+    if record_lines:
+        eol = "\r\n" if record_lines[0].endswith("\r\n") else "\n"
+
+    installed_files = [
+        installed_file
+        for installed_file in Record.read(lines=iter(record_lines))
+        if (
+            (os.path.basename(installed_file.path) not in entry_point_scripts)
+            or (
+                scripts_dir
+                != commonpath(
+                    (
+                        scripts_dir,
+                        os.path.realpath(os.path.join(distribution.location, installed_file.path)),
+                    )
+                )
+            )
+        )
+    ]
+
+    if PY2:
+        record_fp = io.BytesIO()
+        Record.write_fp(fp=record_fp, installed_files=installed_files, eol=eol)
+        return record_fp.getvalue()
+    else:
+        record_fp = io.StringIO()
+        Record.write_fp(fp=record_fp, installed_files=installed_files, eol=eol)
+        return record_fp.getvalue().encode("utf-8")
+
+
 def _install_distribution(
-    venv_install_paths,  # type: InstallPaths
+    interpreter,  # type: PythonInterpreter
+    result_type,  # type: InstallableType.Value
+    use_system_time,  # type: bool
     distribution,  # type: Distribution
 ):
-    # type: (...) -> InstalledWheel
+    # type: (...) -> FingerprintedDistribution
 
     production_assert(distribution.type is DistributionType.INSTALLED)
     production_assert(distribution.metadata.files.metadata.type is MetadataType.DIST_INFO)
 
-    wheel = InstallableWheel(
-        wheel=Wheel.from_distribution(distribution), install_paths=venv_install_paths
+    venv_install_paths = InstallPaths.interpreter(
+        interpreter, project_name=distribution.metadata.project_name
+    )
+    wheel = InstallableWheel.from_whl(
+        whl=Wheel.from_distribution(distribution), install_paths=venv_install_paths
     )
     record_data = wheel.metadata_files.read("RECORD")
     if not record_data:
@@ -74,7 +134,14 @@ def _install_distribution(
         )
 
     installed_wheel_dir = InstalledWheelDir.create(
-        wheel_name=wheel.wheel_file_name, install_hash=hashlib.sha256(record_data).hexdigest()
+        wheel_name=wheel.wheel_file_name,
+        install_hash=hashlib.sha256(
+            _normalize_record(
+                distribution=Distribution(location=wheel.location, metadata=wheel.dist_metadata()),
+                install_paths=venv_install_paths,
+                record_data=record_data,
+            )
+        ).hexdigest(),
     )
     with atomic_directory(target_dir=installed_wheel_dir) as atomic_dir:
         if not atomic_dir.is_finalized():
@@ -94,28 +161,37 @@ def _install_distribution(
                         installed_wheel_dir,
                         os.path.join(symlink_atomic_dir.work_dir, wheel.wheel_file_name),
                     )
-    return InstalledWheel.load(installed_wheel_dir)
+
+    installed_wheel = InstalledWheel.load(installed_wheel_dir)
+    if not installed_wheel.fingerprint:
+        raise AssertionError(reportable_unexpected_error_msg())
+
+    if result_type is InstallableType.INSTALLED_WHEEL_CHROOT:
+        return FingerprintedDistribution(
+            distribution=Distribution.load(installed_wheel.prefix_dir),
+            fingerprint=installed_wheel.fingerprint,
+        )
+    return repacked_whl(
+        installed_wheel, fingerprint=installed_wheel.fingerprint, use_system_time=use_system_time
+    )
 
 
 def _install_venv_distributions(
     venv,  # type: Virtualenv
     distributions,  # type: Iterable[Distribution]
     max_install_jobs=DEFAULT_MAX_JOBS,  # type: int
+    result_type=InstallableType.INSTALLED_WHEEL_CHROOT,  # type: InstallableType.Value
+    use_system_time=False,  # type: bool
 ):
     # type: (...) -> Iterator[FingerprintedDistribution]
 
-    venv_install_paths = InstallPaths.interpreter(venv.interpreter)
-    for installed_wheel in iter_map_parallel(
+    return iter_map_parallel(
         inputs=distributions,
-        function=functools.partial(_install_distribution, venv_install_paths),
+        function=functools.partial(
+            _install_distribution, venv.interpreter, result_type, use_system_time
+        ),
         max_jobs=max_install_jobs,
-    ):
-        if not installed_wheel.fingerprint:
-            raise AssertionError(reportable_unexpected_error_msg())
-        yield FingerprintedDistribution(
-            distribution=Distribution.load(installed_wheel.prefix_dir),
-            fingerprint=installed_wheel.fingerprint,
-        )
+    )
 
 
 @attr.s(frozen=True)
@@ -186,6 +262,7 @@ def _resolve_distributions(
     allow_prereleases=False,  # type: bool
     compile=False,  # type: bool
     ignore_errors=False,  # type: bool
+    result_type=InstallableType.INSTALLED_WHEEL_CHROOT,  # type: InstallableType.Value
 ):
     # type: (...) -> Iterator[Union[Distribution, FingerprintedDistribution, Error]]
 
@@ -261,6 +338,7 @@ def _resolve_distributions(
                     transitive=False,
                     compile=compile,
                     ignore_errors=ignore_errors,
+                    result_type=result_type,
                 )
                 for dist in result.distributions:
                     to_resolve.extend(
@@ -300,12 +378,6 @@ def resolve_from_venv(
 ):
     # type: (...) -> Union[ResolveResult, Error]
 
-    if result_type is InstallableType.WHEEL_FILE:
-        return Error(
-            "Cannot resolve .whl files from virtual environment at {venv_dir}; its distributions "
-            "are all installed.".format(venv_dir=venv.venv_dir)
-        )
-
     target = LocalInterpreter.create(venv.interpreter)
     if not targets.is_empty:
         return Error(
@@ -392,6 +464,7 @@ def resolve_from_venv(
             allow_prereleases=pip_configuration.allow_prereleases,
             compile=compile,
             ignore_errors=ignore_errors,
+            result_type=result_type,
         ):
             if isinstance(distribution_or_error, Error):
                 return distribution_or_error
@@ -437,6 +510,8 @@ def resolve_from_venv(
                         venv=venv,
                         distributions=venv_distributions,
                         max_install_jobs=pip_configuration.max_jobs,
+                        result_type=result_type,
+                        use_system_time=True,
                     )
                 ),
                 fingerprinted_distributions,

pex/resolver.py

@@ -37,10 +37,10 @@ from pex.dist_metadata import (
 )
 from pex.exceptions import production_assert
 from pex.fingerprinted_distribution import FingerprintedDistribution
+from pex.installed_wheel import InstalledWheel
 from pex.jobs import Raise, SpawnedJob, execute_parallel, iter_map_parallel
 from pex.network_configuration import NetworkConfiguration
 from pex.orderedset import OrderedSet
-from pex.pep_376 import InstalledWheel
 from pex.pep_425 import CompatibilityTags
 from pex.pep_427 import InstallableType, WheelError, install_wheel_chroot
 from pex.pep_503 import ProjectName
@@ -622,7 +622,7 @@ class BuildResult(object):
                         target=self.request.target.render_description(),
                     )
                 )
-        return InstallRequest.create(self.request.target, wheel_path)
+        return InstallRequest.create(self.request.target, wheel_path, was_built_locally=True)
 
 
 @attr.s(frozen=True)
@@ -632,6 +632,7 @@ class InstallRequest(object):
         cls,
         target,  # type: Union[DownloadTarget, Target]
         wheel_path,  # type: str
+        was_built_locally=False,  # type: bool
     ):
         # type: (...) -> InstallRequest
         fingerprint = fingerprint_path(wheel_path)
@@ -639,11 +640,13 @@ class InstallRequest(object):
             download_target=_as_download_target(target),
             wheel_path=wheel_path,
             fingerprint=fingerprint,
+            was_built_locally=was_built_locally,
         )
 
     download_target = attr.ib(converter=_as_download_target)  # type: DownloadTarget
     wheel_path = attr.ib()  # type: str
     fingerprint = attr.ib()  # type: str
+    was_built_locally = attr.ib(default=False)  # type: bool
 
     @property
     def target(self):
@@ -987,7 +990,11 @@ def _perform_install(
 ):
     # type: (...) -> InstallResult
     install_result = install_request.result(installed_wheels_dir)
-    install_wheel_chroot(wheel=install_request.wheel_path, destination=install_result.build_chroot)
+    install_wheel_chroot(
+        wheel=install_request.wheel_path,
+        destination=install_result.build_chroot,
+        normalize_file_stat=install_request.was_built_locally,
+    )
     return install_result
 
 

pex/sysconfig.py

@@ -82,7 +82,7 @@ class _PlatformValue(Enum.Value):
         self.arch = arch
 
     @property
-    def extension(self):
+    def exe_extension(self):
         # type: () -> str
         return ".exe" if self.os is Os.WINDOWS else ""
 
@@ -93,12 +93,14 @@ class _PlatformValue(Enum.Value):
 
     def binary_name(self, binary_name):
         # type: (_Text) -> _Text
-        return "{binary_name}{extension}".format(binary_name=binary_name, extension=self.extension)
+        return "{binary_name}{extension}".format(
+            binary_name=binary_name, extension=self.exe_extension
+        )
 
     def qualified_binary_name(self, binary_name):
         # type: (_Text) -> _Text
         return "{binary_name}-{platform}{extension}".format(
-            binary_name=binary_name, platform=self, extension=self.extension
+            binary_name=binary_name, platform=self, extension=self.exe_extension
         )
 
     def qualified_file_name(self, file_name):

pex/third_party/__init__.py

@@ -639,7 +639,7 @@ def expose_installed_wheels(
 
     from pex.atomic_directory import atomic_directory
     from pex.cache.dirs import InstalledWheelDir
-    from pex.pep_376 import InstalledWheel
+    from pex.installed_wheel import InstalledWheel
 
     for path in expose(dists, interpreter=interpreter):
         # TODO(John Sirois): Maybe consolidate with pex.resolver.BuildAndInstallRequest.

pex/tools/commands/repository.py

@@ -18,12 +18,14 @@ from pex import dist_metadata
 from pex.atomic_directory import atomic_directory
 from pex.cache.dirs import CacheDir
 from pex.commands.command import JsonMixin, OutputMixin
-from pex.common import REPRODUCIBLE_BUILDS_ENV, pluralize, safe_mkdir, safe_mkdtemp, safe_open
+from pex.common import pluralize, safe_mkdir, safe_mkdtemp, safe_open
 from pex.compatibility import Queue
 from pex.dist_metadata import Distribution
 from pex.environment import PEXEnvironment
+from pex.installed_wheel import InstalledWheel
 from pex.interpreter import PythonInterpreter
-from pex.jobs import Job, Retain, SpawnedJob, execute_parallel
+from pex.jobs import Job, iter_map_parallel
+from pex.pep_427 import WheelInstallError, repack
 from pex.pex import PEX
 from pex.result import Error, Ok, Result
 from pex.tools.command import PEXCommand
@@ -31,7 +33,7 @@ from pex.typing import TYPE_CHECKING, cast
 from pex.venv.virtualenv import InstallationChoice, Virtualenv
 
 if TYPE_CHECKING:
-    from typing import IO, Any, Callable, Iterable, Iterator, List, Text, Tuple
+    from typing import IO, Any, Callable, Iterable, Iterator, List, Tuple
 
     import attr  # vendor:skip
 
@@ -121,6 +123,29 @@ class FindLinksRepo(object):
         self._server_process.kill()
 
 
+def _extract_wheel(
+    distribution,  # type: Distribution
+    dest_dir,  # type: str
+    use_system_time=False,  # type: bool
+):
+    # type: (...) -> Tuple[Distribution, Result]
+
+    try:
+        whl = repack(
+            installed_wheel=InstalledWheel.load(distribution.location),
+            dest_dir=dest_dir,
+            use_system_time=use_system_time,
+        )
+    except (InstalledWheel.LoadError, WheelInstallError) as e:
+        result = Error(str(e))  # type: Result
+    else:
+        result = Ok(
+            "{distribution}: Repacked wheel as {whl}".format(distribution=distribution, whl=whl)
+        )
+
+    return distribution, result
+
+
 class Repository(JsonMixin, OutputMixin, PEXCommand):
     """Interact with the Python distribution repository contained in a PEX file."""
 
@@ -270,36 +295,23 @@ class Repository(JsonMixin, OutputMixin, PEXCommand):
         if self.options.sources:
             self._extract_sdist(pex, dest_dir)
 
-        def spawn_extract(distribution):
-            # type: (Distribution) -> SpawnedJob[Text]
-            env = os.environ.copy()
-            if not self.options.use_system_time:
-                env.update(REPRODUCIBLE_BUILDS_ENV)
-            job = spawn_python_job_with_setuptools_and_wheel(
-                args=["-m", "wheel", "pack", "--dest-dir", dest_dir, distribution.location],
-                interpreter=pex.interpreter,
-                stdout=subprocess.PIPE,
-                env=env,
-            )
-            return SpawnedJob.stdout(
-                job, result_func=lambda out: "{}: {}".format(distribution, out.decode())
-            )
-
         with self._distributions_output(pex) as (distributions, output):
             errors = []  # type: List[Distribution]
-            for result in execute_parallel(
-                distributions, spawn_extract, error_handler=Retain[Distribution]()
+            for distribution, result in iter_map_parallel(
+                distributions,
+                functools.partial(
+                    _extract_wheel, dest_dir=dest_dir, use_system_time=self.options.use_system_time
+                ),
             ):
-                if isinstance(result, tuple):
-                    distribution, error = result
+                if isinstance(result, Error):
                     errors.append(distribution)
                     output.write(
                         "Failed to build a wheel for {distribution}: {error}\n".format(
-                            distribution=distribution, error=error
+                            distribution=distribution, error=result
                         )
                     )
                 else:
-                    output.write(result)
+                    output.write(str(result))
             if errors:
                 return Error(
                     "Failed to build wheels for {count} {distributions}.".format(
@@ -435,6 +447,17 @@ class Repository(JsonMixin, OutputMixin, PEXCommand):
         with open(os.path.join(chroot, "setup.py"), "w") as fp:
             fp.write("import setuptools; setuptools.setup()")
 
+        with open(os.path.join(chroot, "pyproject.toml"), "w") as fp:
+            fp.write(
+                dedent(
+                    """\
+                    [build-system]
+                    requires = ["setuptools"]
+                    backend = "setuptools.build_meta"
+                    """
+                )
+            )
+
         spawn_python_job_with_setuptools_and_wheel(
             args=["setup.py", "sdist", "--dist-dir", dest_dir],
             interpreter=pex.interpreter,

pex/vendor/__init__.py

@@ -201,9 +201,11 @@ class VendorSpec(
 #     Automated update of Pip's vendored certifi's cacert.pem to that from certifi 2025.7.14.
 # 12.) https://github.com/pex-tool/pip/commit/21a4058f77f9864151510b725419206a2e5645ae
 #     Automated update of Pip's vendored certifi's cacert.pem to that from certifi 2025.8.3.
+# 13.) https://github.com/pex-tool/pip/commit/cef23bb7153ec49037d963e84fcad0f08880fbc5
+#     Automated update of Pip's vendored certifi's cacert.pem to that from certifi 2025.10.5.
 PIP_SPEC = VendorSpec.git(
     repo="https://github.com/pex-tool/pip",
-    commit="21a4058f77f9864151510b725419206a2e5645ae",
+    commit="cef23bb7153ec49037d963e84fcad0f08880fbc5",
     project_name="pip",
     rewrite=False,
 )
@@ -316,7 +318,6 @@ def vendor_runtime(
     dest_basedir,  # type: str
     label,  # type: str
     root_module_names,  # type: Iterable[str]
-    include_dist_info=(),  # type: Iterable[str]
 ):
     # type: (...) -> Set[str]
     """Includes portions of vendored distributions in a chroot.
@@ -329,7 +330,6 @@ def vendor_runtime(
     :param dest_basedir: The prefix to store the vendored code under in the ``chroot``.
     :param label: The chroot label for the vendored code fileset.
     :param root_module_names: The names of the root vendored modules to include in the chroot.
-    :param include_dist_info: Include the .dist-info dirs associated with these root module names.
     :returns: The set of absolute paths of the source files that were vendored.
     :raise: :class:`ValueError` if any of the given ``root_module_names`` could not be found amongst
             the vendored code and added to the chroot.
@@ -368,12 +368,7 @@ def vendor_runtime(
                     vendor_module_names[name] = True
                     TRACER.log("Vendoring {} from {} @ {}".format(name, spec, spec.target_dir), V=3)
 
-                dirs[:] = packages + [
-                    d
-                    for project in include_dist_info
-                    for d in dirs
-                    if d.startswith(project) and d.endswith(".dist-info")
-                ]
+                dirs[:] = packages
                 files[:] = modules
 
             # We copy over sources and data only; no pyc files.