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

pex/pep_427.py

@@ -25,6 +25,7 @@ from pex.common import (
     safe_mkdtemp,
     safe_open,
     safe_relative_symlink,
+    safe_rmtree,
     touch,
 )
 from pex.compatibility import commonpath, string
@@ -134,15 +135,25 @@ class InstallPaths(object):
         wheel,  # type: Wheel
     ):
         # type: (...) -> InstallPaths
+
         base = os.path.join(destination, cls.CHROOT_STASH)
 
+        if wheel.root_is_purelib:
+            purelib = destination
+            platlib = os.path.join(base, "platlib")
+            path_names = ("headers", "scripts", "platlib", "data", "purelib")
+        else:
+            purelib = os.path.join(base, "purelib")
+            platlib = destination
+            path_names = ("headers", "scripts", "purelib", "data", "platlib")
+
         return cls(
-            purelib=destination,
-            platlib=destination,
+            purelib=purelib,
+            platlib=platlib,
             headers=_headers_install_path_for_wheel(base, wheel),
             scripts=os.path.join(base, SCRIPT_DIR),
-            data=base,
-            path_names=("headers", "scripts", "data", "purelib", "platlib"),
+            data=os.path.join(base, "data"),
+            path_names=path_names,
         )
 
     @classmethod
@@ -150,9 +161,17 @@ class InstallPaths(object):
         cls,
         interpreter,  # type: PythonInterpreter
         project_name,  # type: ProjectName
+        root_is_purelib,  # type: bool
     ):
         # type: (...) -> InstallPaths
+
         sysconfig_paths = interpreter.identity.paths
+
+        if root_is_purelib:
+            path_names = ("purelib", "platlib", "headers", "scripts", "data")
+        else:
+            path_names = ("platlib", "purelib", "headers", "scripts", "data")
+
         return cls(
             purelib=sysconfig_paths["purelib"],
             platlib=sysconfig_paths["platlib"],
@@ -163,7 +182,7 @@ class InstallPaths(object):
             ),
             scripts=sysconfig_paths["scripts"],
             data=sysconfig_paths["data"],
-            path_names=("purelib", "platlib", "headers", "scripts", "data"),
+            path_names=path_names,
         )
 
     @classmethod
@@ -186,27 +205,30 @@ class InstallPaths(object):
     def wheel(
         cls,
         destination,  # type: str
-        project_name,  # type: ProjectName
-        version,  # type: Version
+        wheel,  # type: Union[Wheel, InstallableWheel]
     ):
         # type: (...) -> InstallPaths
 
         data = os.path.join(
-            destination,
-            "{project_name}-{version}.data".format(
-                # N.B.: We don't use the canonical form since it goes to lowercase.
-                project_name=re.sub(r"[-_.]+", "_", project_name.raw),
-                # N.B.: We don't use the canonical form since it drop trailing zero segments.
-                version=version.raw.replace("-", "_"),
-            ),
+            destination, "{wheel_prefix}.data".format(wheel_prefix=wheel.wheel_prefix)
         )
+
+        if wheel.root_is_purelib:
+            purelib = destination
+            platlib = os.path.join(data, "platlib")
+            path_names = ("headers", "scripts", "platlib", "data", "purelib")
+        else:
+            purelib = os.path.join(data, "purelib")
+            platlib = destination
+            path_names = ("headers", "scripts", "purelib", "data", "platlib")
+
         return cls(
-            purelib=destination,
-            platlib=destination,
+            purelib=purelib,
+            platlib=platlib,
             headers=os.path.join(data, "headers"),
             scripts=os.path.join(data, "scripts"),
             data=os.path.join(data, "data"),
-            path_names=("headers", "scripts", "data", "purelib", "platlib"),
+            path_names=path_names,
         )
 
     purelib = attr.ib()  # type: str
@@ -481,16 +503,10 @@ class InstallableWheel(object):
 
         object.__setattr__(self, "is_whl", is_whl)
 
-    def iter_applicable_install_paths(self):
+    def iter_install_paths_by_name(self):
         # type: () -> Iterator[Tuple[str, str]]
         if self.install_paths:
             for path_name, path in self.install_paths:
-                if path_name == "purelib":
-                    if not self.root_is_purelib:
-                        continue
-                elif path_name == "platlib":
-                    if self.root_is_purelib:
-                        continue
                 yield path_name, path
 
     @property
@@ -518,6 +534,11 @@ class InstallableWheel(object):
         # type: () -> str
         return self.wheel.data_dir
 
+    @property
+    def wheel_prefix(self):
+        # type: () -> str
+        return self.wheel.wheel_prefix
+
     @property
     def wheel_file_name(self):
         # type: () -> str
@@ -623,9 +644,10 @@ def install_wheel_chroot(
     wheel_to_install = (
         wheel if isinstance(wheel, InstallableWheel) else InstallableWheel.from_whl(wheel)
     )
+    chroot_install_paths = InstallPaths.chroot(destination, wheel=wheel_to_install.wheel)
     install_wheel(
         wheel_to_install,
-        InstallPaths.chroot(destination, wheel=wheel_to_install.wheel),
+        chroot_install_paths,
         record_entry_info=True,
         normalize_file_stat=normalize_file_stat,
     )
@@ -635,11 +657,21 @@ def install_wheel_chroot(
         record_relpath is not None
     ), "The {module}.install_wheel function should always create a RECORD.".format(module=__name__)
 
+    root_is_purelib = wheel_to_install.root_is_purelib
+
+    entry_names = ("purelib", "platlib") if root_is_purelib else ("platlib", "purelib")
+    sys_path_entries = []  # type: List[str]
+    for entry_name in entry_names:
+        entry = chroot_install_paths[entry_name]
+        if os.path.isdir(entry):
+            sys_path_entries.append(os.path.relpath(entry, destination))
+
     return InstalledWheel.save(
         prefix_dir=destination,
         stash_dir=InstallPaths.CHROOT_STASH,
         record_relpath=record_relpath,
-        root_is_purelib=wheel_to_install.root_is_purelib,
+        root_is_purelib=root_is_purelib,
+        sys_path_entries=tuple(sys_path_entries),
     )
 
 
@@ -659,7 +691,9 @@ def install_wheel_interpreter(
     return install_wheel(
         wheel_to_install,
         InstallPaths.interpreter(
-            interpreter, project_name=wheel_to_install.metadata_files.metadata.project_name
+            interpreter,
+            project_name=wheel_to_install.project_name,
+            root_is_purelib=wheel_to_install.root_is_purelib,
         ),
         copy_mode=copy_mode,
         interpreter=interpreter,
@@ -710,11 +744,7 @@ def create_whl(
     whl_chroot = os.path.join(safe_mkdtemp(prefix="pex_create_whl."), whl_file_name)
     install_wheel(
         wheel_to_create,
-        InstallPaths.wheel(
-            destination=whl_chroot,
-            project_name=wheel_to_create.project_name,
-            version=wheel_to_create.version,
-        ),
+        InstallPaths.wheel(destination=whl_chroot, wheel=wheel_to_create),
         compile=compile,
         install_entry_point_scripts=False,
     )
@@ -759,6 +789,20 @@ def _detect_record_eol(path):
     return "\r\n" if line.endswith(b"\r\n") else "\n"
 
 
+def _iter_installed_files(
+    chroot,  # type: str
+    exclude_rel_paths=(),  # type: Iterable[str]
+):
+    # type: (...) -> Iterator[InstalledFile]
+    exclude = frozenset(exclude_rel_paths)
+    for root, _, files in deterministic_walk(chroot):
+        for path in files:
+            rel_path = os.path.relpath(os.path.join(root, path), chroot)
+            if rel_path in exclude:
+                continue
+            yield InstalledFile(rel_path)
+
+
 def install_wheel(
     wheel,  # type: InstallableWheel
     install_paths,  # type: InstallPaths
@@ -783,12 +827,14 @@ def install_wheel(
         else:
             install_paths = attr.evolve(install_paths, platlib=dest)
 
+    data_dir = None  # type: Optional[str]
     if wheel.is_whl:
         whl = wheel.location
         zip_metadata = None  # type: Optional[ZipMetadata]
         with open_zip(whl) as zf:
             # 1. Unpack
             zf.extractall(dest)
+            data_dir = os.path.join(dest, wheel.data_dir)
             if record_entry_info:
                 zip_metadata = ZipMetadata.from_zip(
                     filename=whl, info_list=zf.infolist(), normalize_file_stat=normalize_file_stat
@@ -799,11 +845,10 @@ def install_wheel(
             # poked on a per-entry basis allowing forging a RECORD entry and its associated file.
             # Only an outer fingerprint of the whole wheel really solves this sort of tampering.
 
+        unpacked_wheel = Wheel.load(dest, project_name=wheel.project_name)
         wheel = InstallableWheel(
-            wheel=Wheel.load(dest, project_name=wheel.project_name),
-            install_paths=InstallPaths.wheel(
-                dest, project_name=wheel.project_name, version=wheel.version
-            ),
+            wheel=unpacked_wheel,
+            install_paths=InstallPaths.wheel(dest, wheel=unpacked_wheel),
             zip_metadata=zip_metadata,
         )
 
@@ -838,11 +883,7 @@ def install_wheel(
             # Write a minimal repaired record to drive the spread operation below.
             Record.write(
                 dst=os.path.join(dest, wheel.metadata_path("RECORD")),
-                installed_files=[
-                    InstalledFile(os.path.relpath(os.path.join(root, path), dest))
-                    for root, _, files in deterministic_walk(dest)
-                    for path in files
-                ],
+                installed_files=list(_iter_installed_files(dest)),
                 eol=eol,
             )
 
@@ -851,10 +892,23 @@ def install_wheel(
 
     record_data = wheel.metadata_files.read("RECORD")
     if not record_data:
-        raise WheelInstallError(
-            "Cannot re-install installed wheel for {source} because it has no installation "
-            "RECORD metadata.".format(source=wheel.source)
-        )
+        try:
+            installed_wheel = InstalledWheel.load(wheel.location)
+        except InstalledWheel.LoadError:
+            raise WheelInstallError(
+                "Cannot re-install wheel for {source} because it has no installation RECORD "
+                "metadata.".format(source=wheel.source)
+            )
+        else:
+            # This is a legacy installed wheel layout with no RECORD; so we concoct one
+            layout_file_rel_path = os.path.relpath(
+                installed_wheel.layout_file(wheel.location), wheel.location
+            )
+            record_data = Record.write_bytes(
+                installed_files=_iter_installed_files(
+                    chroot=wheel.location, exclude_rel_paths=[layout_file_rel_path]
+                )
+            )
 
     # 2. Spread
     entry_points = wheel.distribution().get_entry_map()
@@ -896,7 +950,7 @@ def install_wheel(
 
         src_file = os.path.realpath(os.path.join(wheel.location, installed_file.path))
         dst_components = None  # type: Optional[Tuple[Text, Text, bool]]
-        for path_name, installed_path in wheel.iter_applicable_install_paths():
+        for path_name, installed_path in wheel.iter_install_paths_by_name():
             installed_path = os.path.realpath(installed_path)
             if installed_path == commonpath((installed_path, src_file)):
                 rewrite_script = False
@@ -963,6 +1017,8 @@ def install_wheel(
                     shutil.copy(src_file, dst_file)
             installed_files.append(create_installed_file(path=dst_file, dest_dir=dest))
             provenance.append((src_file, dst_file))
+    if data_dir:
+        safe_rmtree(data_dir)
 
     if compile:
         args = [

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,
@@ -44,7 +43,7 @@ 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.wheel import WHEEL, Wheel
 from pex.whl import repacked_whl
 
 if TYPE_CHECKING:
@@ -93,15 +92,7 @@ def _normalize_record(
             )
         )
     ]
-
-    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")
+    return Record.write_bytes(installed_files=installed_files, eol=eol)
 
 
 def _install_distribution(
@@ -116,7 +107,9 @@ def _install_distribution(
     production_assert(distribution.metadata.files.metadata.type is MetadataType.DIST_INFO)
 
     venv_install_paths = InstallPaths.interpreter(
-        interpreter, project_name=distribution.metadata.project_name
+        interpreter,
+        project_name=distribution.metadata.project_name,
+        root_is_purelib=WHEEL.from_distribution(distribution).root_is_purelib,
     )
     wheel = InstallableWheel.from_whl(
         whl=Wheel.from_distribution(distribution), install_paths=venv_install_paths

pex/tools/commands/repository.py

@@ -1,7 +1,7 @@
 # Copyright 2021 Pex project contributors.
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
 
 import functools
 import logging
@@ -311,7 +311,7 @@ class Repository(JsonMixin, OutputMixin, PEXCommand):
                         )
                     )
                 else:
-                    output.write(str(result))
+                    print(result, file=output)
             if errors:
                 return Error(
                     "Failed to build wheels for {count} {distributions}.".format(

pex/vendor/__main__.py

@@ -544,11 +544,12 @@ def vendorize(root_dir, vendor_specs, prefix, update):
         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())
+            vendored_wheel = Wheel.load(wheel_chroot)
             install_wheel_chroot(
                 wheel=InstallableWheel(
-                    wheel=Wheel.load(wheel_chroot),
+                    wheel=vendored_wheel,
                     install_paths=InstallPaths.wheel(
-                        destination=wheel_chroot, project_name=project_name, version=version
+                        destination=wheel_chroot, wheel=vendored_wheel
                     ),
                     zip_metadata=zip_metadata,
                 ),

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

@@ -1 +1 @@
-{"fingerprint":"93bbf4f9990c23d7f074400fbc7b72699025043cff2ba03c34196ad876cc265c","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","sys_path_entries":["."]}

pex/vendor/_vendored/appdirs/.layout.json

@@ -1 +1 @@
-{"fingerprint":"24fd20ba81e67b247f15013f7f14f1932d342923d2f07d3a2cc73f264d01ca28","record_relpath":"appdirs-1.4.4.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix"}
+{"fingerprint":"24fd20ba81e67b247f15013f7f14f1932d342923d2f07d3a2cc73f264d01ca28","record_relpath":"appdirs-1.4.4.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix","sys_path_entries":["."]}

pex/vendor/_vendored/attrs/.layout.json

@@ -1 +1 @@
-{"fingerprint":"60e0467569716898b2972fe5a3d4c9949a86cabb361124271abdc4fda2aabc8c","record_relpath":"attrs-21.5.0.dev0.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix"}
+{"fingerprint":"60e0467569716898b2972fe5a3d4c9949a86cabb361124271abdc4fda2aabc8c","record_relpath":"attrs-21.5.0.dev0.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix","sys_path_entries":["."]}

pex/vendor/_vendored/packaging_20_9/.layout.json

@@ -1 +1 @@
-{"fingerprint":"e781ec09b3aa335b5436874df6b22577ddce0818a227be1c81ccc86aff78e850","record_relpath":"packaging-20.9.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix"}
+{"fingerprint":"fb91f8df1ae86fdd0ebd7287158df23cf6d56791475d93841e7d3a76ec4eb23f","record_relpath":"packaging-20.9.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix","sys_path_entries":["."]}

pex/vendor/_vendored/packaging_21_3/.layout.json

@@ -1 +1 @@
-{"fingerprint":"17df8d37531246cbaf3690d78527842b5679ffc7cd4361d0c4bfceb5bf395346","record_relpath":"packaging-21.3.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix"}
+{"fingerprint":"cb292a10d66bc05830548f9ae6da7d06b33cda7955eccb68a065436b119fefac","record_relpath":"packaging-21.3.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix","sys_path_entries":["."]}

pex/vendor/_vendored/packaging_24_0/.layout.json

@@ -1 +1 @@
-{"fingerprint":"2688e613bb54c0b61a1c101acb2aa489d06d2c524bfc9502c56768eedeb2f6eb","record_relpath":"packaging-24.0.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix"}
+{"fingerprint":"2688e613bb54c0b61a1c101acb2aa489d06d2c524bfc9502c56768eedeb2f6eb","record_relpath":"packaging-24.0.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix","sys_path_entries":["."]}

pex/vendor/_vendored/packaging_25_0/.layout.json

@@ -1 +1 @@
-{"fingerprint":"c042647020954d0559e1bc7ae62bb4c2e5d6c586504b564a397a16b1fabd5f96","record_relpath":"packaging-25.0.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix"}
+{"fingerprint":"c042647020954d0559e1bc7ae62bb4c2e5d6c586504b564a397a16b1fabd5f96","record_relpath":"packaging-25.0.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix","sys_path_entries":["."]}

pex/vendor/_vendored/pip/.layout.json

@@ -1 +1 @@
-{"fingerprint":"93065fed46b0a0db8737c4a33aa24819d527ace9c84e9cdb8f9e41e9e2bd926a","record_relpath":"pip-20.3.4.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix"}
+{"fingerprint":"93065fed46b0a0db8737c4a33aa24819d527ace9c84e9cdb8f9e41e9e2bd926a","record_relpath":"pip-20.3.4.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix","sys_path_entries":["."]}

pex/vendor/_vendored/setuptools/.layout.json

@@ -1 +1 @@
-{"fingerprint":"b9e945a694f66bcb00f8366aadeb01b88e6b042b6c49b44b98c4bb814d8460e3","record_relpath":"setuptools-44.0.0+3acb925dd708430aeaf197ea53ac8a752f7c1863.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix"}
+{"fingerprint":"b9e945a694f66bcb00f8366aadeb01b88e6b042b6c49b44b98c4bb814d8460e3","record_relpath":"setuptools-44.0.0+3acb925dd708430aeaf197ea53ac8a752f7c1863.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix","sys_path_entries":["."]}

pex/vendor/_vendored/toml/.layout.json

@@ -1 +1 @@
-{"fingerprint":"e022215e30b009ca1018a9255f6812d150469e3f6ff12687dd93459dd5a5274d","record_relpath":"toml-0.10.2.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix"}
+{"fingerprint":"e022215e30b009ca1018a9255f6812d150469e3f6ff12687dd93459dd5a5274d","record_relpath":"toml-0.10.2.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix","sys_path_entries":["."]}

pex/vendor/_vendored/tomli/.layout.json

@@ -1 +1 @@
-{"fingerprint":"bbe9219bfe424168417563a7c481eeed73fbb39ef7458e0e8ba636276afb2822","record_relpath":"tomli-2.0.1.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix"}
+{"fingerprint":"bbe9219bfe424168417563a7c481eeed73fbb39ef7458e0e8ba636276afb2822","record_relpath":"tomli-2.0.1.dist-info/RECORD","root_is_purelib":true,"stash_dir":".prefix","sys_path_entries":["."]}

pex/version.py

@@ -1,4 +1,4 @@
 # Copyright 2015 Pex project contributors.
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-__version__ = "2.60.0"
+__version__ = "2.60.2"

pex/wheel.py

@@ -225,6 +225,18 @@ class Wheel(object):
         # type: () -> Version
         return self.metadata_files.metadata.version
 
+    @property
+    def wheel_prefix(self):
+        # type: () -> str
+
+        # N.B.: We don't use the canonical form since it goes to lowercase.
+        project_name = re.sub(r"[-_.]+", "_", self.project_name.raw)
+
+        # N.B.: We don't use the canonical form since it drop trailing zero segments.
+        version = self.version.raw.replace("-", "_")
+
+        return "{project_name}-{version}".format(project_name=project_name, version=version)
+
     @property
     def wheel_file_name(self):
         # type: () -> str
@@ -239,10 +251,7 @@ class Wheel(object):
         tag = "{interpreters}-{abis}-{platforms}".format(
             interpreters=".".join(interpreters), abis=".".join(abis), platforms=".".join(platforms)
         )
-
-        return "{project_name}-{version}-{tag}.whl".format(
-            project_name=self.project_name.raw, version=self.version.raw, tag=tag
-        )
+        return "{wheel_prefix}-{tag}.whl".format(wheel_prefix=self.wheel_prefix, tag=tag)
 
     def iter_compatible_python_versions(self):
         # type: () -> Iterator[Tuple[int, ...]]

{pex-2.60.0.dist-info → pex-2.60.2.dist-info}/METADATA

@@ -1,15 +1,15 @@
 Metadata-Version: 2.4
 Name: pex
-Version: 2.60.0
+Version: 2.60.2
 Summary: The PEX packaging toolchain.
 Home-page: https://github.com/pex-tool/pex
-Download-URL: https://github.com/pex-tool/pex/releases/download/v2.60.0/pex
+Download-URL: https://github.com/pex-tool/pex/releases/download/v2.60.2/pex
 Author: The PEX developers
 Author-email: developers@pex-tool.org
 License-Expression: Apache-2.0
-Project-URL: Changelog, https://github.com/pex-tool/pex/blob/v2.60.0/CHANGES.md
+Project-URL: Changelog, https://github.com/pex-tool/pex/blob/v2.60.2/CHANGES.md
 Project-URL: Documentation, https://docs.pex-tool.org/
-Project-URL: Source, https://github.com/pex-tool/pex/tree/v2.60.0
+Project-URL: Source, https://github.com/pex-tool/pex/tree/v2.60.2
 Keywords: package,executable,virtualenv,lock,freeze
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers