pex 2.54.2__py2.py3-none-any.whl → 2.69.0__py2.py3-none-any.whl

pex/auth.py

@@ -64,7 +64,7 @@ class Machine(object):
 class PasswordEntry(object):
     @classmethod
     def maybe_extract_from_url(cls, url):
-        # type: (str) -> Optional[PasswordEntry]
+        # type: (Text) -> Optional[PasswordEntry]
         url_info = urlparse.urlparse(url)
         if not url_info.username or not url_info.password:
             return None

pex/bin/pex.py

@@ -24,6 +24,7 @@ from pex.commands.command import (
     register_global_arguments,
 )
 from pex.common import CopyMode, die, is_pyc_dir, is_pyc_file
+from pex.compatibility import commonpath
 from pex.dependency_configuration import DependencyConfiguration
 from pex.dependency_manager import DependencyManager
 from pex.dist_metadata import Requirement
@@ -144,6 +145,7 @@ def configure_clp_pex_resolution(parser):
         include_pex_lock=True,
         include_pylock=True,
         include_pre_resolved=True,
+        include_venv_repository=True,
     )
 
     group.add_argument(
@@ -757,7 +759,8 @@ def configure_clp_sources(parser):
         parser,
         project_help=(
             "Add the local project at the specified path to the generated .pex file along with "
-            "its transitive dependencies."
+            "its transitive dependencies. The path can be that of a project directory, a project"
+            "sdist or a pre-built project wheel."
         ),
     )
 
@@ -800,6 +803,16 @@ class PositionalArgumentFromFileParser(object):
 
 def configure_clp():
     # type: () -> PositionalArgumentFromFileParser
+
+    prog = sys.argv[0]
+    if os.path.isabs(prog):
+        entries = os.environ.get("PATH", os.defpath).split(os.pathsep)
+        entries.append(os.getcwd())
+        for entry in entries:
+            if os.path.isabs(entry) and entry == commonpath((entry, prog)):
+                prog = os.path.relpath(prog, entry)
+                break
+
     usage = (
         "%(prog)s [-o OUTPUT.PEX] [options] [-- arg1 arg2 ...]\n\n"
         "%(prog)s builds a PEX (Python Executable) file based on the given specifications: "
@@ -809,7 +822,7 @@ def configure_clp():
         "with an @ symbol. These files must contain one argument per line."
     )
 
-    parser = ArgumentParser(usage=usage, formatter_class=ArgumentDefaultsHelpFormatter)
+    parser = ArgumentParser(prog=prog, usage=usage, formatter_class=ArgumentDefaultsHelpFormatter)
     parser.add_argument("-V", "--version", action="version", version=__version__)
 
     configure_clp_pex_resolution(parser)

pex/build_backend/configuration.py

@@ -63,8 +63,8 @@ class Plugin(object):
 
         return cls(modify_sdist=modify_sdist, modify_wheel=modify_wheel)
 
-    _modify_sdist = attr.ib()  # type: Optional[Callable[[str], None]]
-    _modify_wheel = attr.ib()  # type: Optional[Callable[[str, str], None]]
+    _modify_sdist = attr.ib()  # type: Optional[Callable[[Text], None]]
+    _modify_wheel = attr.ib()  # type: Optional[Callable[[Text, Text], None]]
 
     @property
     def modifies_sdists(self):
@@ -72,7 +72,7 @@ class Plugin(object):
         return self._modify_sdist is not None
 
     def modify_sdist(self, sdist_dir):
-        # type: (str) -> Any
+        # type: (Text) -> Any
         if self._modify_sdist:
             return self._modify_sdist(sdist_dir)
         return None
@@ -84,8 +84,8 @@ class Plugin(object):
 
     def modify_wheel(
         self,
-        wheel_dir,  # type: str
-        dist_info_dir_relpath,  # type: str
+        wheel_dir,  # type: Text
+        dist_info_dir_relpath,  # type: Text
     ):
         # type: (...) -> Any
         if self._modify_wheel:

pex/build_backend/wrap.py

@@ -11,6 +11,7 @@ import io
 import os
 import tarfile
 
+from pex import sdist
 from pex.build_backend import BuildError
 from pex.build_backend.configuration import load_config
 from pex.build_backend.pylock import ScriptLocks
@@ -22,10 +23,11 @@ from pex.common import (
     open_zip,
     safe_mkdtemp,
 )
+from pex.compatibility import PY2
 from pex.typing import TYPE_CHECKING, cast
 
 if TYPE_CHECKING:
-    from typing import Any, Dict, Iterator, Optional
+    from typing import Any, Callable, Dict, Iterator, Optional, Sequence, Tuple
 
 
 _CONFIG = load_config(internal_plugins=[(ScriptLocks.CONFIG_KEY, ScriptLocks)])
@@ -62,25 +64,7 @@ def build_sdist(
 
     sdist_path = os.path.join(sdist_directory, sdist_name)
     build_dir = _build_dir("sdist")
-
-    with tarfile.open(sdist_path) as tf:
-        tf.extractall(build_dir)
-
-    entries = os.listdir(build_dir)
-    if len(entries) != 1:
-        raise BuildError(
-            "Calling `{backend}.build_sdist` produced an sdist with unexpected contents.\n"
-            "Expected expected one top-level <project>-<version> directory but found {count}:\n"
-            "{entries}".format(
-                backend=_CONFIG.delegate_build_backend,
-                count=len(entries),
-                entries="\n".join(entries),
-            )
-        )
-
-    tarball_root_dir_name = entries[0]
-    tarball_root_dir = os.path.join(build_dir, tarball_root_dir_name)
-
+    tarball_root_dir = sdist.extract_tarball(sdist_path, dest_dir=build_dir)
     for plugin in plugins:
         plugin.modify_sdist(tarball_root_dir)
 
@@ -96,6 +80,27 @@ def build_sdist(
     return sdist_name
 
 
+if TYPE_CHECKING:
+    from typing import Protocol
+
+    class CSVWriter(Protocol):
+        def writerow(self, row):
+            # type: (Sequence[Any]) -> None
+            pass
+
+
+def csv_output():
+    # type: () -> Tuple[CSVWriter, Callable[[], bytes]]
+    if PY2:
+        record = io.BytesIO()
+        csv_writer = csv.writer(record, delimiter=",", quotechar='"', lineterminator="\n")
+        return csv_writer, record.getvalue
+    else:
+        record = io.StringIO()
+        csv_writer = csv.writer(record, delimiter=",", quotechar='"', lineterminator="\n")
+        return csv_writer, lambda: record.getvalue().encode("utf-8")
+
+
 def build_wheel(
     wheel_directory,  # type: str
     config_settings=None,  # type: Optional[Dict[str, Any]]
@@ -142,8 +147,7 @@ def build_wheel(
     record_zinfo, _ = ZipFileEx.zip_info_from_file(
         os.path.join(build_dir, record_relpath), arcname=record_relpath, date_time=date_time
     )
-    record = io.StringIO()
-    csv_writer = csv.writer(record, delimiter=",", quotechar='"', lineterminator="\n")
+    csv_writer, get_csv_bytes = csv_output()
     with open_zip(wheel_path, "w") as zf:
         for path in _iter_files_deterministic(build_dir):
             if path == record_relpath:
@@ -162,6 +166,6 @@ def build_wheel(
             )
 
         csv_writer.writerow((record_relpath, None, None))
-        zf.writestr(record_zinfo, record.getvalue().encode("utf-8"))
+        zf.writestr(record_zinfo, get_csv_bytes())
 
     return wheel_name

pex/build_system/pep_517.py

@@ -11,7 +11,7 @@ from textwrap import dedent
 from pex import third_party
 from pex.build_system import DEFAULT_BUILD_BACKEND
 from pex.build_system.pep_518 import BuildSystem, load_build_system
-from pex.common import safe_mkdtemp
+from pex.common import safe_mkdir, safe_mkdtemp
 from pex.dist_metadata import DistMetadata, Distribution, MetadataType
 from pex.jobs import Job, SpawnedJob
 from pex.pip.version import PipVersion, PipVersionValue
@@ -227,6 +227,9 @@ def build_sdist(
                 "{stderr}".format(project_directory=project_directory, err=e, stderr=e.stderr)
             )
 
+    # N.B.: Although it's not clear the spec mandates this, ensure the dist dir exists before
+    # handing it to the back end. See: https://github.com/pex-tool/pex/issues/2913 for motivation.
+    safe_mkdir(dist_dir)
     spawned_job_or_error = _invoke_build_hook(
         project_directory,
         target,

pex/cache/dirs.py

@@ -144,7 +144,7 @@ class CacheDir(Enum["CacheDir.Value"]):
 
     INSTALLED_WHEELS = Value(
         "installed_wheels",
-        version=0,
+        version=2,
         name="Pre-installed Wheels",
         description=(
             "Pre-installed wheel chroots used to both build PEXes and serve as runtime `sys.path` "
@@ -178,7 +178,7 @@ class CacheDir(Enum["CacheDir.Value"]):
 
     PIP = Value(
         "pip",
-        version=1,
+        version=3,
         name="Pip Versions",
         description="Isolated Pip caches and Pip PEXes Pex uses to resolve distributions.",
         dependencies=[INSTALLED_WHEELS],
@@ -193,6 +193,16 @@ class CacheDir(Enum["CacheDir.Value"]):
         ),
     )
 
+    REPACKED_WHEELS = Value(
+        "repacked_wheels",
+        version=0,
+        name="Reconstituted Wheels",
+        description=(
+            "Wheels that have been reconstituted from {installed_wheels!r}, as well as from wheels "
+            "installed in venvs.".format(installed_wheels=INSTALLED_WHEELS.rel_path())
+        ),
+    )
+
     RUN = Value(
         "run",
         version=0,
@@ -226,7 +236,7 @@ class CacheDir(Enum["CacheDir.Value"]):
 
     UNZIPPED_PEXES = Value(
         "unzipped_pexes",
-        version=1,
+        version=3,
         name="Unzipped PEXes",
         description="The unzipped PEX files executed on this machine.",
         dependencies=[BOOTSTRAPS, USER_CODE, INSTALLED_WHEELS],
@@ -234,7 +244,7 @@ class CacheDir(Enum["CacheDir.Value"]):
 
     VENVS = Value(
         "venvs",
-        version=1,
+        version=3,
         name="Virtual Environments",
         description="Virtual environments generated at runtime for `--venv` mode PEXes.",
         dependencies=[INSTALLED_WHEELS],
@@ -719,7 +729,7 @@ class BuiltWheelDir(AtomicCacheDir):
 
         from pex.dist_metadata import ProjectNameAndVersion, UnrecognizedDistributionFormat
 
-        for path in glob.glob(CacheDir.BUILT_WHEELS.path("sdists", "*", "*")):
+        for path in glob.glob(CacheDir.BUILT_WHEELS.path("sdists", "*", "*", pex_root=pex_root)):
             sdist, fingerprint = os.path.split(path)
             try:
                 pnav = ProjectNameAndVersion.from_filename(sdist)
@@ -735,7 +745,7 @@ class BuiltWheelDir(AtomicCacheDir):
                     yield BuiltWheelDir(path=dist_dir, dist_dir=dist_dir, file_name=file_name)
 
         for built_wheel in glob.glob(
-            CacheDir.BUILT_WHEELS.path("local_projects", "*", "*", "*", "*")
+            CacheDir.BUILT_WHEELS.path("local_projects", "*", "*", "*", "*", pex_root=pex_root)
         ):
             file_name = os.path.basename(built_wheel)
             dist_dir = os.path.dirname(built_wheel)
@@ -745,26 +755,21 @@ class BuiltWheelDir(AtomicCacheDir):
     def create(
         cls,
         sdist,  # type: str
-        fingerprint=None,  # type: Optional[str]
+        fingerprint,  # type: str
         pnav=None,  # type: Optional[ProjectNameAndVersion]
         target=None,  # type: Optional[Target]
         pex_root=ENV,  # type: Union[str, Variables]
     ):
         # type: (...) -> BuiltWheelDir
 
-        import hashlib
-
         from pex import targets
         from pex.dist_metadata import is_sdist
-        from pex.util import CacheHelper
 
         if is_sdist(sdist):
             dist_type = "sdists"
-            fingerprint = fingerprint or CacheHelper.hash(sdist, hasher=hashlib.sha256)
             file_name = os.path.basename(sdist)
         else:
             dist_type = "local_projects"
-            fingerprint = fingerprint or CacheHelper.dir_hash(sdist, hasher=hashlib.sha256)
             file_name = None
 
         # For the purposes of building a wheel from source, the product should be uniqued by the