pex 2.59.5__py2.py3-none-any.whl → 2.60.1__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,7 +5,6 @@ from __future__ import absolute_import
 
 import functools
 import hashlib
-import io
 import itertools
 import os
 from collections import defaultdict, deque
@@ -14,7 +13,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.compatibility import commonpath
 from pex.dependency_configuration import DependencyConfiguration
 from pex.dist_metadata import (
     Constraint,
@@ -26,9 +25,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, Record
+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
@@ -43,6 +44,7 @@ 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
@@ -69,9 +71,14 @@ def _normalize_record(
         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_data.decode("utf-8").splitlines()))
+        for installed_file in Record.read(lines=iter(record_lines))
         if (
             (os.path.basename(installed_file.path) not in entry_point_scripts)
             or (
@@ -85,28 +92,25 @@ def _normalize_record(
             )
         )
     ]
-
-    if PY2:
-        record_fp = io.BytesIO()
-        Record.write_fp(fp=record_fp, installed_files=installed_files)
-        return record_fp.getvalue()
-    else:
-        record_fp = io.StringIO()
-        Record.write_fp(fp=record_fp, installed_files=installed_files)
-        return record_fp.getvalue().encode("utf-8")
+    return Record.write_bytes(installed_files=installed_files, eol=eol)
 
 
 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:
@@ -148,28 +152,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)
@@ -240,6 +253,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]]
 
@@ -315,6 +329,7 @@ def _resolve_distributions(
                     transitive=False,
                     compile=compile,
                     ignore_errors=ignore_errors,
+                    result_type=result_type,
                 )
                 for dist in result.distributions:
                     to_resolve.extend(
@@ -354,12 +369,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(
@@ -446,6 +455,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
@@ -491,6 +501,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

@@ -318,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.
@@ -331,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.
@@ -370,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.

pex/vendor/__main__.py

@@ -6,11 +6,12 @@ from __future__ import absolute_import, print_function
 import glob
 import os
 import pkgutil
-import re
 import subprocess
 import sys
+import zipfile
 from argparse import ArgumentParser
 from collections import OrderedDict, defaultdict
+from contextlib import closing
 from typing import FrozenSet, Iterator, List
 
 import libcst
@@ -36,7 +37,15 @@ from libcst import (
     SimpleString,
 )
 
-from pex.common import safe_delete, safe_mkdir, safe_mkdtemp, safe_open, safe_rmtree
+from pex.common import (
+    REPRODUCIBLE_BUILDS_ENV,
+    safe_delete,
+    safe_mkdir,
+    safe_mkdtemp,
+    safe_open,
+    safe_rmtree,
+)
+from pex.pep_427 import ZipMetadata
 from pex.typing import TYPE_CHECKING
 from pex.vendor import VendorSpec, iter_vendor_specs
 
@@ -362,10 +371,10 @@ def vendorize(root_dir, vendor_specs, prefix, update):
     # importable code must lie at the top of its vendored chroot. Although
     # `pex.pep_472.install_wheel_chroot` encodes the logic to achieve this layout, we can't run
     # that without 1st approximating that layout!. We take the tack of performing an importable
-    # installation using `pip wheel ...` + `wheel unpack ...`. Although simply un-packing a wheel
+    # installation using `pip wheel ...` + `unzip ...`. Although simply unzipping a wheel
     # does not make it importable in general, it works for our pure-python vendored code.
 
-    unpacked_wheel_chroots_by_vendor_spec = defaultdict(list)
+    unzipped_wheel_chroots_by_vendor_spec = defaultdict(list)
     for vendor_spec in vendor_specs:
         # NB: We set --no-build-isolation to prevent pip from installing the requirements listed in
         # its [build-system] config in its pyproject.toml.
@@ -387,6 +396,7 @@ def vendorize(root_dir, vendor_specs, prefix, update):
         cmd = [
             "pip",
             "wheel",
+            "--prefer-binary",
             "--no-build-isolation",
             "--no-cache-dir",
             "--wheel-dir",
@@ -408,7 +418,9 @@ def vendorize(root_dir, vendor_specs, prefix, update):
             if os.path.isfile(constraints_file):
                 cmd.extend(["--constraint", constraints_file])
 
-        result = subprocess.call(cmd)
+        env = os.environ.copy()
+        env.update(REPRODUCIBLE_BUILDS_ENV)
+        result = subprocess.call(cmd, env=env)
         if result != 0:
             raise VendorizeError("Failed to vendor {!r}".format(vendor_spec))
 
@@ -416,22 +428,17 @@ def vendorize(root_dir, vendor_specs, prefix, update):
         # later.
         safe_mkdir(vendor_spec.target_dir)
         for wheel_file in glob.glob(os.path.join(wheels_dir, "*.whl")):
-            extract_dir = os.path.join(wheels_dir, ".extracted")
-            output = subprocess.check_output(
-                ["wheel", "unpack", "--dest", extract_dir, wheel_file]
-            ).decode("utf-8")
-            match = re.match(r"^Unpacking to: (?P<unpack_dir>.+)\.\.\.OK$", output)
-            assert match is not None, (
-                "Failed to determine {wheel_file} unpack dir from wheel unpack output:\n"
-                "{output}".format(wheel_file=wheel_file, output=output)
+            unzipped_wheel_dir = os.path.join(
+                wheels_dir, ".extracted", os.path.basename(wheel_file)
+            )
+            with closing(zipfile.ZipFile(wheel_file)) as zf:
+                zf.extractall(unzipped_wheel_dir)
+            unzipped_wheel_chroots_by_vendor_spec[vendor_spec].append(
+                (unzipped_wheel_dir, wheel_file)
             )
-            unpacked_to_dir = os.path.join(extract_dir, match["unpack_dir"])
-            unpacked_wheel_dir = os.path.join(extract_dir, os.path.basename(wheel_file))
-            os.rename(unpacked_to_dir, unpacked_wheel_dir)
-            unpacked_wheel_chroots_by_vendor_spec[vendor_spec].append(unpacked_wheel_dir)
-            for path in os.listdir(unpacked_wheel_dir):
+            for path in os.listdir(unzipped_wheel_dir):
                 os.symlink(
-                    os.path.join(unpacked_wheel_dir, path),
+                    os.path.join(unzipped_wheel_dir, path),
                     os.path.join(vendor_spec.target_dir, path),
                 )
 
@@ -484,7 +491,8 @@ def vendorize(root_dir, vendor_specs, prefix, update):
     # Import all code needed below now before we move any vendored bits it depends on temporarily
     # back to the prefix site-packages dir.
     from pex.dist_metadata import ProjectNameAndVersion, Requirement
-    from pex.pep_427 import install_wheel_chroot
+    from pex.pep_427 import InstallableWheel, InstallPaths, install_wheel_chroot
+    from pex.wheel import Wheel
 
     for vendor_spec in vendor_specs:
         print(
@@ -512,29 +520,40 @@ def vendorize(root_dir, vendor_specs, prefix, update):
         # We want the primary artifact to own any special Pex wheel chroot metadata; so we arrange
         # a list of installs that place it last.
         primary_project = Requirement.parse(vendor_spec.requirement).project_name
-        wheel_chroots_by_project_name = {
-            ProjectNameAndVersion.from_filename(
-                wheel_chroot
-            ).canonicalized_project_name: wheel_chroot
-            for wheel_chroot in unpacked_wheel_chroots_by_vendor_spec[vendor_spec]
-        }
-        primary_wheel_chroot = wheel_chroots_by_project_name.pop(primary_project)
+        wheel_chroots_by_project_name = OrderedDict()
+        for wheel_chroot, wheel_file in unzipped_wheel_chroots_by_vendor_spec[vendor_spec]:
+            pnav = ProjectNameAndVersion.from_filename(wheel_chroot)
+            wheel_chroots_by_project_name[pnav.canonicalized_project_name] = (
+                pnav.canonicalized_project_name,
+                pnav.canonicalized_version,
+                wheel_chroot,
+                wheel_file,
+            )
+
+        (
+            project_name,
+            version,
+            primary_wheel_chroot,
+            primary_wheel_file,
+        ) = wheel_chroots_by_project_name.pop(primary_project)
         wheels_chroots_to_install = list(wheel_chroots_by_project_name.values())
-        wheels_chroots_to_install.append(primary_wheel_chroot)
-
-        for wheel_chroot in wheels_chroots_to_install:
-            dest_dir = safe_mkdtemp()
-            subprocess.check_call(["wheel", "pack", "--dest-dir", dest_dir, wheel_chroot])
-            wheel_files = glob.glob(os.path.join(dest_dir, "*.whl"))
-            assert len(wheel_files) == 1, (
-                "Expected re-packing {wheel_chroot} to produce one `.whl` file but found {count}:\n"
-                "{wheel_files}"
-            ).format(
-                wheel_chroot=wheel_chroot,
-                count=len(wheel_files),
-                wheel_files="\n".join(os.path.basename(wheel_file) for wheel_file in wheel_files),
+        wheels_chroots_to_install.append(
+            (project_name, version, primary_wheel_chroot, primary_wheel_file)
+        )
+
+        for project_name, version, wheel_chroot, wheel_file in wheels_chroots_to_install:
+            with closing(zipfile.ZipFile(wheel_file)) as zf:
+                zip_metadata = ZipMetadata.from_zip(filename=wheel_file, info_list=zf.infolist())
+            install_wheel_chroot(
+                wheel=InstallableWheel(
+                    wheel=Wheel.load(wheel_chroot),
+                    install_paths=InstallPaths.wheel(
+                        destination=wheel_chroot, project_name=project_name, version=version
+                    ),
+                    zip_metadata=zip_metadata,
+                ),
+                destination=vendor_spec.target_dir,
             )
-            install_wheel_chroot(wheel=wheel_files[0], destination=vendor_spec.target_dir)
 
 
 if __name__ == "__main__":
@@ -551,6 +570,8 @@ if __name__ == "__main__":
     root_directory = VendorSpec.ROOT
     try:
         safe_rmtree(VendorSpec.vendor_root())
+        # Stabilize our umask to get the same file perms on any run.
+        os.umask(0o022)
         vendorize(
             root_dir=root_directory,
             vendor_specs=list(iter_vendor_specs()),

pex/vendor/_vendored/ansicolors/.layout.json

@@ -1 +1 @@
-{"fingerprint": "a175b8cdfaabde6458bf70a07cf4ea1a51d4a8edf2502dff5777a049b610f354", "record_relpath": "ansicolors-1.1.8.dist-info/RECORD", "root_is_purelib": true, "stash_dir": ".prefix"}
+{"fingerprint":"93bbf4f9990c23d7f074400fbc7b72699025043cff2ba03c34196ad876cc265c","record_relpath":"ansicolors-1.1.8.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix"}

pex/vendor/_vendored/ansicolors/ansicolors-1.1.8.dist-info/RECORD

@@ -0,0 +1,11 @@
+ansicolors-1.1.8.dist-info/DESCRIPTION.rst,sha256=hgL3qWOqDdnS5m7OGbUJvvZ_gOnggqyKN0LzedMq3o4,7900
+ansicolors-1.1.8.dist-info/METADATA,sha256=91m-dxXKkt0Fg_Zv_HA7Zlxx2f1bGDFRn0cMD-6YkvI,9006
+ansicolors-1.1.8.dist-info/RECORD,,
+ansicolors-1.1.8.dist-info/WHEEL,sha256=o2k-Qa-RMNIJmUdIc7KU6VWR_ErNRbWNlxDIpl7lm34,110
+ansicolors-1.1.8.dist-info/metadata.json,sha256=jEvYWhL1nvf1IOuhZN76kIr3cS4QQN9_aql483E8Sd8,1181
+ansicolors-1.1.8.dist-info/top_level.txt,sha256=igtcW1b_UlN1_x_2Ooi1-5-0ZZzr7UbkgT0OyOkOz1A,7
+colors/__init__.py,sha256=7UV3RlAaU9ihmC33l1KnlJ19mV79q9knPrayzG0LA4g,119
+colors/colors.py,sha256=VNM8dhjwb51Q3rbNFLhAfl-Xi3vd88NLnLT8BavVpXg,5603
+colors/csscolors.py,sha256=pYW3Yisj3bGz-ocg23jxmqQ7YjNFoaZuLW38Lrqd8pg,6584
+colors/version.py,sha256=1AmxhanHVlK7-ylUJmxvVmAhH674NXaZPyMgOYTXThQ,22
+ansicolors-1.1.8.pex-info/original-whl-info.json,sha256=HbV2rpplaYIBPX3BXgmvHbJ3jE4Kai_UN1AI0iFOiAg,717

pex/vendor/_vendored/ansicolors/ansicolors-1.1.8.pex-info/original-whl-info.json

@@ -0,0 +1 @@
+{"entries":[["colors/__init__.py",[2017,5,17,21,12,12],2175008768],["colors/colors.py",[2017,6,2,20,55,34],2175008768],["colors/csscolors.py",[2017,6,2,19,55,26],2175008768],["colors/version.py",[2017,6,2,21,17,26],2175008768],["ansicolors-1.1.8.dist-info/DESCRIPTION.rst",[2017,6,2,21,22,12],2175008768],["ansicolors-1.1.8.dist-info/metadata.json",[2017,6,2,21,22,12],2175008768],["ansicolors-1.1.8.dist-info/top_level.txt",[2017,6,2,21,22,12],2175008768],["ansicolors-1.1.8.dist-info/WHEEL",[2017,6,2,21,22,12],2175008768],["ansicolors-1.1.8.dist-info/METADATA",[2017,6,2,21,22,12],2175008768],["ansicolors-1.1.8.dist-info/RECORD",[2017,6,2,21,22,12],2175008768]],"filename":"ansicolors-1.1.8-py2.py3-none-any.whl"}