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

pex/scie/model.py

@@ -303,6 +303,8 @@ class ScieOptions(object):
     python_version = attr.ib(
         default=None
     )  # type: Optional[Union[Tuple[int, int], Tuple[int, int, int]]]
+    pbs_free_threaded = attr.ib(default=False)  # type: bool
+    pbs_debug = attr.ib(default=False)  # type: bool
     pbs_stripped = attr.ib(default=False)  # type: bool
     hash_algorithms = attr.ib(default=())  # type: Tuple[str, ...]
     science_binary = attr.ib(default=None)  # type: Optional[Union[File, Url]]

pex/scie/science.py

@@ -24,6 +24,7 @@ from pex.hashing import Sha256
 from pex.os import is_exe
 from pex.pep_440 import Version
 from pex.pex import PEX
+from pex.pex_info import PexInfo
 from pex.result import Error, try_
 from pex.scie.model import (
     File,
@@ -37,6 +38,7 @@ from pex.scie.model import (
 )
 from pex.sysconfig import SysPlatform
 from pex.third_party.packaging.specifiers import SpecifierSet
+from pex.third_party.packaging.utils import parse_wheel_filename
 from pex.third_party.packaging.version import InvalidVersion
 from pex.tracer import TRACER
 from pex.typing import TYPE_CHECKING
@@ -66,7 +68,7 @@ class Manifest(object):
 
 
 SCIENCE_RELEASES_URL = "https://github.com/a-scie/lift/releases"
-MIN_SCIENCE_VERSION = Version("0.14.0")
+MIN_SCIENCE_VERSION = Version("0.15.1")
 SCIENCE_REQUIREMENT = SpecifierSet("~={min_version}".format(min_version=MIN_SCIENCE_VERSION))
 
 
@@ -104,6 +106,16 @@ class Filenames(Enum["Filenames.Value"]):
 Filenames.seal()
 
 
+def _is_free_threaded_pex(pex_info):
+    # type: (PexInfo) -> bool
+    for distribution in pex_info.distributions:
+        _, _, _, tags = parse_wheel_filename(os.path.basename(distribution))
+        for tag in tags:
+            if tag.abi.startswith(("cp", "abi3")) and "t" in tag.abi:
+                return True
+    return False
+
+
 def create_manifests(
     configuration,  # type: ScieConfiguration
     name,  # type: str
@@ -270,6 +282,7 @@ def create_manifests(
     }
 
     configure_binding_args = [Filenames.PEX.placeholder, Filenames.CONFIGURE_BINDING.placeholder]
+    pbs_free_threaded = _is_free_threaded_pex(pex_info) or configuration.options.pbs_free_threaded
     for interpreter in configuration.interpreters:
         lift = lift_template.copy()
 
@@ -285,10 +298,17 @@ def create_manifests(
             interpreter.platform.qualified_file_name("{name}-lift.toml".format(name=name)),
         )
 
+        version_str = interpreter.version_str
+        if Provider.PythonBuildStandalone is interpreter.provider:
+            if configuration.options.pbs_debug:
+                version_str += "d"
+            if pbs_free_threaded:
+                version_str += "t"
+
         interpreter_config = {
             "id": "python-distribution",
             "provider": interpreter.provider.value,
-            "version": interpreter.version_str,
+            "version": version_str,
             "lazy": configuration.options.style is ScieStyle.LAZY,
         }
         if interpreter.release:
@@ -297,7 +317,9 @@ def create_manifests(
             interpreter_config["base_url"] = "/".join(
                 (configuration.options.assets_base_url, "providers", str(interpreter.provider))
             )
-        if Provider.PythonBuildStandalone is interpreter.provider:
+        if Provider.PythonBuildStandalone is interpreter.provider and not (
+            configuration.options.pbs_debug or pbs_free_threaded
+        ):
             interpreter_config.update(
                 flavor=(
                     "install_only_stripped"

pex/sdist.py

@@ -0,0 +1,219 @@
+# Copyright 2025 Pex project contributors.
+# Licensed under the Apache License, Version 2.0 (see LICENSE).
+
+from __future__ import absolute_import
+
+import copy
+import os.path
+import sys
+import tarfile
+from tarfile import TarInfo
+
+from pex.compatibility import commonpath
+from pex.typing import TYPE_CHECKING, cast
+
+if TYPE_CHECKING:
+    from typing import Any, Dict, Optional, Text, TypeVar
+
+
+class FilterError(tarfile.TarError):
+    pass
+
+
+class AbsolutePathError(FilterError):
+    pass
+
+
+class OutsideDestinationError(FilterError):
+    pass
+
+
+class SpecialFileError(FilterError):
+    pass
+
+
+class AbsoluteLinkError(FilterError):
+    pass
+
+
+class LinkOutsideDestinationError(FilterError):
+    pass
+
+
+_REALPATH_KWARGS = (
+    {"strict": getattr(os.path, "ALLOW_MISSING", False)} if sys.version_info[:2] >= (3, 10) else {}
+)  # type: Dict[str, Any]
+
+
+if TYPE_CHECKING:
+    _Text = TypeVar("_Text", str, Text)
+
+
+def _realpath(path):
+    # type: (_Text) -> _Text
+    return os.path.realpath(path, **_REALPATH_KWARGS)
+
+
+def _get_filtered_attrs(
+    member,  # type: TarInfo
+    dest_path,  # type: Text
+    for_data=True,  # type: bool
+):
+    # type: (...) -> Dict[str, Any]
+
+    # N.B.: Copied from CPython 3.14 stdlib tarfile.py
+    # Modifications:
+    # + Exception types replicated with error messages placed at call site.
+    # + `os.path.realpath` -> `_realpath` to deal with `strict` parameter.
+    # + `os.path.commonpath` -> `pex.compatibility.commonpath`
+    # + `mode = None` guarded by `sys.version_info[:2] >= (3, 12)` with commentary.
+    # + `{uid,gid,uname,gname} = None` guarded by `sys.version_info[:2] >= (3, 12)` with commentary.
+
+    new_attrs = {}  # type: Dict[str, Any]
+    name = member.name
+    dest_path = _realpath(dest_path)
+    # Strip leading / (tar's directory separator) from filenames.
+    # Include os.sep (target OS directory separator) as well.
+    if name.startswith(("/", os.sep)):
+        name = new_attrs["name"] = member.path.lstrip("/" + os.sep)
+    if os.path.isabs(name):
+        # Path is absolute even after stripping.
+        # For example, 'C:/foo' on Windows.
+        raise AbsolutePathError("member {name!r} has an absolute path".format(name=member.name))
+    # Ensure we stay in the destination
+    target_path = _realpath(os.path.join(dest_path, name))
+    if commonpath([target_path, dest_path]) != dest_path:
+        raise OutsideDestinationError(
+            "{name!r} would be extracted to {path!r}, which is outside the destination".format(
+                name=member.name, path=target_path
+            )
+        )
+    # Limit permissions (no high bits, and go-w)
+    mode = member.mode  # type: Optional[int]
+    if mode is not None:
+        # Strip high bits & group/other write bits
+        mode = mode & 0o755
+        if for_data:
+            # For data, handle permissions & file types
+            if member.isreg() or member.islnk():
+                if not mode & 0o100:
+                    # Clear executable bits if not executable by user
+                    mode &= ~0o111
+                # Ensure owner can read & write
+                mode |= 0o600
+            elif member.isdir() or member.issym():
+                if sys.version_info[:2] >= (3, 12):
+                    # Ignore mode for directories & symlinks
+                    mode = None
+                else:
+                    # Retain stripped mode since older Pythons do not support None.
+                    pass
+            else:
+                # Reject special files
+                raise SpecialFileError("{name!r} is a special file".format(name=member.name))
+        if mode != member.mode:
+            new_attrs["mode"] = mode
+    if for_data:
+        if sys.version_info[:2] >= (3, 12):
+            # Ignore ownership for 'data'
+            if member.uid is not None:
+                new_attrs["uid"] = None
+            if member.gid is not None:
+                new_attrs["gid"] = None
+            if member.uname is not None:
+                new_attrs["uname"] = None
+            if member.gname is not None:
+                new_attrs["gname"] = None
+        else:
+            # Retain uid/gid/uname/gname since older Pythons do not support None.
+            pass
+
+        # Check link destination for 'data'
+        if member.islnk() or member.issym():
+            if os.path.isabs(member.linkname):
+                raise AbsoluteLinkError(
+                    "{name!r} is a link to an absolute path".format(name=member.name)
+                )
+            normalized = os.path.normpath(member.linkname)
+            if normalized != member.linkname:
+                new_attrs["linkname"] = normalized
+            if member.issym():
+                target_path = os.path.join(dest_path, os.path.dirname(name), member.linkname)
+            else:
+                target_path = os.path.join(dest_path, member.linkname)
+            target_path = _realpath(target_path)
+            if commonpath([target_path, dest_path]) != dest_path:
+                raise LinkOutsideDestinationError(
+                    "{name!r} would link to {path!r}, which is outside the destination".format(
+                        name=member.name, path=target_path
+                    )
+                )
+    return new_attrs
+
+
+def _replace(
+    member,  # type: TarInfo
+    attrs,  # type: Dict[str, Any]
+):
+    # type: (...) -> TarInfo
+
+    replace = getattr(member, "replace", None)
+    if replace:
+        attrs["deep"] = False
+        return cast(TarInfo, replace(**attrs))
+
+    result = copy.copy(member)
+    for attr, value in attrs.items():
+        setattr(result, attr, value)
+    return result
+
+
+def _data_filter(
+    member,  # type: TarInfo
+    dest_path,  # type: Text
+):
+    # type: (...) -> TarInfo
+    new_attrs = _get_filtered_attrs(member, dest_path, True)
+    if new_attrs:
+        return _replace(member, new_attrs)
+    return member
+
+
+_EXTRACTALL_DATA_FILTER_KWARGS = {"filter": "data"}  # type: Dict[str, Any]
+
+
+class InvalidSourceDistributionError(ValueError):
+    pass
+
+
+def extract_tarball(
+    tarball_path,  # type: Text
+    dest_dir,  # type: _Text
+):
+    # type: (...) -> _Text
+
+    with tarfile.open(tarball_path) as tf:
+        if sys.version_info[:2] >= (3, 12):
+            tf.extractall(dest_dir, **_EXTRACTALL_DATA_FILTER_KWARGS)
+        else:
+            for tar_info in tf:  # type: ignore[unreachable]
+                tar_info = _data_filter(tar_info, dest_dir)
+                tf.extract(tar_info, dest_dir)
+
+    listing = os.listdir(dest_dir)
+    if len(listing) != 1:
+        raise InvalidSourceDistributionError(
+            "Expected one top-level project directory to be extracted from {project}, "
+            "found {count}: {listing}".format(
+                project=tarball_path, count=len(listing), listing=", ".join(listing)
+            )
+        )
+
+    project_dir = os.path.join(dest_dir, listing[0])
+    if not os.path.isdir(project_dir):
+        raise InvalidSourceDistributionError(
+            "Expected one top-level project directory to be extracted from {project}, "
+            "found file: {path}".format(project=tarball_path, path=listing[0])
+        )
+
+    return project_dir

pex/version.py

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

pex/wheel.py

@@ -42,7 +42,7 @@ class WHEEL(object):
     """
 
     @classmethod
-    def _from_metadata_files(cls, metadata_files):
+    def from_metadata_files(cls, metadata_files):
         # type: (MetadataFiles) -> WHEEL
 
         metadata_bytes = metadata_files.read("WHEEL")
@@ -52,7 +52,18 @@ class WHEEL(object):
                     wheel=metadata_files.render_description(metadata_file_name="WHEEL")
                 )
             )
-        metadata = parse_message(metadata_bytes)
+
+        # Some WHEEL metadata in the wild has blank lines in between headers when it should not.
+        # Since WHEEL metadata, unlike METADATA, does not use the message body to convey metadata,
+        # this should be safe.
+        #
+        # See here for initial discovery case:
+        #   https://github.com/pex-tool/pex/issues/2998#issuecomment-3492998265
+        normalized_metadata = b"".join(
+            line for line in metadata_bytes.splitlines(True) if line.strip()
+        )
+
+        metadata = parse_message(normalized_metadata)
         return cls(files=metadata_files, metadata=metadata)
 
     _CACHE = {}  # type: Dict[Tuple[Text, Optional[ProjectName]], WHEEL]
@@ -73,7 +84,7 @@ class WHEEL(object):
                 raise WheelMetadataLoadError(
                     "Could not find any metadata in {wheel}.".format(wheel=location)
                 )
-            wheel = cls._from_metadata_files(metadata_files)
+            wheel = cls.from_metadata_files(metadata_files)
             cls._CACHE[(location, project_name)] = wheel
         return wheel
 
@@ -84,7 +95,7 @@ class WHEEL(object):
         project_name = distribution.metadata.project_name
         wheel = cls._CACHE.get((location, project_name))
         if not wheel:
-            wheel = cls._from_metadata_files(distribution.metadata.files)
+            wheel = cls.from_metadata_files(distribution.metadata.files)
             cls._CACHE[(location, project_name)] = wheel
         return wheel
 
@@ -144,14 +155,7 @@ class Wheel(object):
         if wheel:
             metadata = wheel
         else:
-            wheel_data = metadata_files.read("WHEEL")
-            if not wheel_data:
-                raise WheelMetadataLoadError(
-                    "Could not find WHEEL metadata in {source}.".format(
-                        source=cls._source(location, metadata_files)
-                    )
-                )
-            metadata = WHEEL(files=metadata_files, metadata=parse_message(wheel_data))
+            metadata = WHEEL.from_metadata_files(metadata_files)
 
         wheel_metadata_dir = os.path.dirname(metadata_files.metadata.rel_path)
         if not wheel_metadata_dir.endswith(".dist-info"):

{pex-2.64.1.dist-info → pex-2.69.0.dist-info}/METADATA

@@ -1,15 +1,15 @@
 Metadata-Version: 2.4
 Name: pex
-Version: 2.64.1
+Version: 2.69.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.64.1/pex
+Download-URL: https://github.com/pex-tool/pex/releases/download/v2.69.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.64.1/CHANGES.md
+Project-URL: Changelog, https://github.com/pex-tool/pex/blob/v2.69.0/CHANGES.md
 Project-URL: Documentation, https://docs.pex-tool.org/
-Project-URL: Source, https://github.com/pex-tool/pex/tree/v2.64.1
+Project-URL: Source, https://github.com/pex-tool/pex/tree/v2.69.0
 Keywords: package,executable,virtualenv,lock,freeze
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers