pex 2.58.0__tar.gz → 2.59.0__tar.gz

{pex-2.58.0 → pex-2.59.0}/CHANGES.md

@@ -1,5 +1,21 @@
 # Release Notes
 
+## 2.59.0
+
+This release adds support for a `--venv-repository` resolution source. This allows creating a PEX
+from a pre-existing venv. By default, all installed venv distributions are included in the PEX, but
+by specifying requirements, the venv can be subset. The `--venv-repository` source is also supported
+by `pex3 venv create` allowing subsetting an existing venv directly into a new venv as well.
+
+* Add support for `--venv-repository` resolver. (#2916)
+
+## 2.58.1
+
+This release fixes a bug building source distributions from locks of local project directories when
+the local project uses the `uv_build` backend.
+
+* Fix sdist build of local projects using `uv_build`. (#2914)
+
 ## 2.58.0
 
 This release adds `--derive-sources-from-requirements-files` to allow for scoping requirement

{pex-2.58.0 → pex-2.59.0}/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.4
 Name: pex
-Version: 2.58.0
+Version: 2.59.0
 Summary: The PEX packaging toolchain.
 Home-page: https://github.com/pex-tool/pex
-Download-URL: https://github.com/pex-tool/pex/releases/download/v2.58.0/pex
+Download-URL: https://github.com/pex-tool/pex/releases/download/v2.59.0/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.58.0/CHANGES.md
+Project-URL: Changelog, https://github.com/pex-tool/pex/blob/v2.59.0/CHANGES.md
 Project-URL: Documentation, https://docs.pex-tool.org/
-Project-URL: Source, https://github.com/pex-tool/pex/tree/v2.58.0
+Project-URL: Source, https://github.com/pex-tool/pex/tree/v2.59.0
 Keywords: package,executable,virtualenv,lock,freeze
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers

{pex-2.58.0 → pex-2.59.0}/docker/base/install_pythons.sh

@@ -12,7 +12,6 @@ DEADSNAKES_VERSIONS=(
   "3.9 {dev,venv,distutils}=3.9.23"
   "3.10 {dev,venv,distutils}=3.10.18"
   "3.13 {dev,venv}=3.13.7"
-  "3.14 {dev,venv}=3.14.0~rc2"
 )
 
 add-apt-repository --yes --ppa deadsnakes
@@ -37,6 +36,7 @@ PYENV_VERSIONS=(
   3.5.10
   3.6.15
   3.12.11
+  3.14.0rc3
   pypy2.7-7.3.20
   pypy3.5-7.0.0
   pypy3.6-7.3.3

{pex-2.58.0 → pex-2.59.0}/pex/bin/pex.py

@@ -144,6 +144,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(

{pex-2.58.0 → pex-2.59.0}/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-2.58.0 → pex-2.59.0}/pex/cli/commands/venv.py

@@ -8,7 +8,7 @@ import logging
 import os.path
 from argparse import ArgumentParser, _ActionsContainer
 
-from pex import pex_warnings
+from pex import dependency_configuration, pex_warnings
 from pex.cli.command import BuildTimeCommand
 from pex.commands.command import JsonMixin, OutputMixin
 from pex.common import CopyMode, open_zip, pluralize
@@ -123,8 +123,10 @@ class Venv(OutputMixin, JsonMixin, BuildTimeCommand):
             include_pex_lock=True,
             include_pylock=True,
             include_pre_resolved=True,
+            include_venv_repository=True,
         )
         requirement_options.register(parser)
+        dependency_configuration.register(parser)
 
     @classmethod
     def add_extra_arguments(
@@ -285,11 +287,13 @@ class Venv(OutputMixin, JsonMixin, BuildTimeCommand):
                 )
 
         requirement_configuration = requirement_options.configure(self.options)
+        dependency_config = dependency_configuration.configure(self.options)
         with TRACER.timed("Resolving distributions"):
             resolved = configured_resolve.resolve(
                 targets=targets,
                 requirement_configuration=requirement_configuration,
                 resolver_configuration=resolver_configuration,
+                dependency_configuration=dependency_config,
             )
 
         pex = None  # type: Optional[PEX]

{pex-2.58.0 → pex-2.59.0}/pex/dependency_configuration.py

@@ -141,8 +141,12 @@ class DependencyConfiguration(object):
         # type: (Requirement) -> Tuple[Requirement, ...]
         return self.overridden.get(requirement.project_name, ())
 
-    def overridden_by(self, requirement, target):
-        # type: (Requirement, Target) -> Optional[Requirement]
+    def overridden_by(
+        self,
+        requirement,  # type: Requirement
+        target,  # type: Target
+    ):
+        # type: (...) -> Optional[Requirement]
         overrides = self.overrides_for(requirement)
         applicable_overrides = [
             override for override in overrides if target.requirement_applies(override)

{pex-2.58.0 → pex-2.59.0}/pex/dist_metadata.py

@@ -152,15 +152,24 @@ class DistMetadataFile(object):
     version = attr.ib()  # type: Version
     pkg_info = attr.ib(eq=False)  # type: Message
 
-    def render_description(self):
-        # type: () -> str
+    def render_metadata_file_description(self, metadata_file_rel_path):
+        # type: (Text) -> str
         return "{project_name} {version} metadata from {rel_path} at {location}".format(
             project_name=self.project_name,
             version=self.version,
-            rel_path=self.rel_path,
+            rel_path=metadata_file_rel_path,
             location=self.location,
         )
 
+    def render_description(self):
+        # type: () -> str
+        return self.render_metadata_file_description(self.rel_path)
+
+    @property
+    def path(self):
+        # type: () -> Text
+        return os.path.join(self.location, self.rel_path)
+
 
 @attr.s(frozen=True)
 class MetadataFiles(object):
@@ -182,6 +191,14 @@ class MetadataFiles(object):
             return None
         return self._read_function(rel_path)
 
+    def render_description(self, metadata_file_name):
+        # type: (Text) -> str
+        rel_path = self.metadata_file_rel_path(metadata_file_name)
+        return self.metadata.render_metadata_file_description(
+            rel_path
+            or "{metadata_file_name} not found".format(metadata_file_name=metadata_file_name)
+        )
+
 
 class MetadataType(Enum["MetadataType.Value"]):
     class Value(Enum.Value):
@@ -210,6 +227,15 @@ class MetadataKey(object):
     location = attr.ib()  # type: Text
 
 
+def _read_function(
+    location,  # type: Text
+    rel_path,  # type: Text
+):
+    # type: (...) -> bytes
+    with open(os.path.join(location, rel_path), "rb") as fp:
+        return fp.read()
+
+
 def _find_installed_metadata_files(
     location,  # type: Text
     metadata_type,  # type: MetadataType.Value
@@ -218,6 +244,7 @@ def _find_installed_metadata_files(
 ):
     # type: (...) -> Iterator[MetadataFiles]
     metadata_files = glob.glob(os.path.join(location, metadata_dir_glob, metadata_file_name))
+    read_function = functools.partial(_read_function, location)
     for path in metadata_files:
         with open(path, "rb") as fp:
             metadata = parse_message(fp.read())
@@ -225,11 +252,6 @@ def _find_installed_metadata_files(
                 source=path, pkg_info=metadata
             )
 
-            def read_function(rel_path):
-                # type: (Text) -> bytes
-                with open(os.path.join(location, rel_path), "rb") as fp:
-                    return fp.read()
-
             yield MetadataFiles(
                 metadata=DistMetadataFile(
                     type=metadata_type,

{pex-2.58.0 → pex-2.59.0}/pex/environment.py

@@ -66,6 +66,22 @@ def _import_pkg_resources():
             return None, False
 
 
+def _fd_lt(
+    self,  # type: FingerprintedDistribution
+    other,  # type: FingerprintedDistribution
+):
+    # type: (...) -> bool
+    if self.project_name.normalized < other.project_name.normalized:
+        return True
+
+    # Since we want to rank higher versions higher (earlier) we need to reverse the natural
+    # ordering of Version in Distribution which is least to greatest.
+    if self.distribution.metadata.version >= other.distribution.metadata.version:
+        return True
+
+    return self.fingerprint < other.fingerprint
+
+
 @attr.s(frozen=True)
 class _RankedDistribution(object):
     # N.B.: A distribution implements rich comparison with the leading component being the
@@ -77,9 +93,7 @@ class _RankedDistribution(object):
     # The attr project type stub file simply misses this.
     _fd_cmp = attr.cmp_using(  # type: ignore[attr-defined]
         eq=FingerprintedDistribution.__eq__,
-        # Since we want to rank higher versions higher (earlier) we need to reverse the natural
-        # ordering of Version in Distribution which is least to greatest.
-        lt=FingerprintedDistribution.__ge__,
+        lt=_fd_lt,
     )
 
     @classmethod

{pex-2.58.0 → pex-2.59.0}/pex/pep_425.py

@@ -6,11 +6,12 @@ from __future__ import absolute_import
 import itertools
 import os.path
 
-from pex.dist_metadata import is_wheel
+from pex.dist_metadata import Distribution, is_wheel
 from pex.orderedset import OrderedSet
 from pex.rank import Rank
 from pex.third_party.packaging.tags import Tag, parse_tag
 from pex.typing import TYPE_CHECKING, cast, overload
+from pex.wheel import WHEEL
 
 if TYPE_CHECKING:
     from typing import (
@@ -66,7 +67,13 @@ class CompatibilityTags(object):
 
     @classmethod
     def from_wheel(cls, wheel):
-        # type: (Text) -> CompatibilityTags
+        # type: (Union[Text, Distribution]) -> CompatibilityTags
+
+        if isinstance(wheel, Distribution):
+            if not is_wheel(wheel.location):
+                return cls(tags=WHEEL.from_distribution(wheel).tags)
+            wheel = wheel.location
+
         if not is_wheel(wheel):
             raise ValueError(
                 "Can only calculate wheel tags from a filename that ends in .whl per "
@@ -74,6 +81,7 @@ class CompatibilityTags(object):
                     wheel=wheel
                 )
             )
+
         wheel_stem, _ = os.path.splitext(os.path.basename(wheel))
         # Wheel filename format: https://peps.python.org/pep-0427/#file-name-convention
         # `{distribution}-{version}(-{build tag})?-{python tag}-{abi tag}-{platform tag}.whl`
@@ -86,6 +94,7 @@ class CompatibilityTags(object):
                     pattern=pattern, wheel=wheel
                 )
             )
+
         return cls(tags=tuple(parse_tag("-".join(wheel_components[-3:]))))
 
     @classmethod