pex 2.59.2__tar.gz → 2.59.4__tar.gz

{pex-2.59.2 → pex-2.59.4}/CHANGES.md

@@ -1,5 +1,21 @@
 # Release Notes
 
+## 2.59.4
+
+This release fixes a bug in `--venv-repository` resolution that would lead to resolution failure
+when the same wheel (that has console script entry points) is installed in multiple venvs and those
+venvs are used as `--venv-repository` resolve sources.
+
+* Fix `--venv-repository` wheel cache copy-pasta bug. (#2932)
+
+## 2.59.3
+
+This release fixes `--venv-repository` to work with venvs that have installed wheels with
+non-conformant `WHEEL` metadata. Notably, from wheels built with maturin that have a compressed tag
+set; e.g.: `hf-xet-1.1.10-cp37-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl`.
+
+* Stabilize non-conformant WHEEL Tag metadata. (#2927)
+
 ## 2.59.2
 
 This release fixes two bugs handling split universal resolves. Previously, when a universal resolve

{pex-2.59.2 → pex-2.59.4}/PKG-INFO

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

{pex-2.59.2 → pex-2.59.4}/docker/base/install_pythons.sh

@@ -11,7 +11,7 @@ DEADSNAKES_VERSIONS=(
   "3.8 {dev,venv,distutils}=3.8.20"
   "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"
 )
 
 add-apt-repository --yes --ppa deadsnakes
@@ -36,7 +36,7 @@ PYENV_VERSIONS=(
   3.5.10
   3.6.15
   3.12.11
-  3.14.0rc3
+  3.13.8
   pypy2.7-7.3.20
   pypy3.5-7.0.0
   pypy3.6-7.3.3

{pex-2.59.2 → pex-2.59.4}/pex/interpreter_constraints.py

@@ -379,8 +379,9 @@ COMPATIBLE_PYTHON_VERSIONS = (
     PythonVersion(Lifecycle.STABLE, 3, 10, 18),
     PythonVersion(Lifecycle.STABLE, 3, 11, 13),
     PythonVersion(Lifecycle.STABLE, 3, 12, 11),
-    PythonVersion(Lifecycle.STABLE, 3, 13, 7),
-    PythonVersion(Lifecycle.DEV, 3, 14, 0),
+    PythonVersion(Lifecycle.STABLE, 3, 13, 8),
+    PythonVersion(Lifecycle.STABLE, 3, 14, 0),
+    PythonVersion(Lifecycle.DEV, 3, 15, 0),
 )
 
 

{pex-2.59.2 → pex-2.59.4}/pex/resolve/venv_resolver.py

@@ -86,7 +86,7 @@ def _install_distribution(
                 raise AssertionError(reportable_unexpected_error_msg())
             runtime_key_dir = CacheDir.INSTALLED_WHEELS.path(installed_wheel.fingerprint)
             with atomic_directory(runtime_key_dir) as symlink_atomic_dir:
-                if not atomic_dir.is_finalized():
+                if not symlink_atomic_dir.is_finalized():
                     # Note: Create a relative path symlink between the two directories so that the
                     # PEX_ROOT can be used within a chroot environment where the prefix of the path
                     # may change between programs running inside and outside the chroot.

{pex-2.59.2 → pex-2.59.4}/pex/sh_boot.py

@@ -87,7 +87,7 @@ def _calculate_applicable_binary_names(
     # more sophisticated detection and re-direction from these during its own bootstrap. When doing
     # so, select these interpreters from newest to oldest since it more likely any given machine
     # will have Python 3 at this point than it will Python 2.
-    pex_requires_python = SpecifierSet(">=2.7")
+    pex_requires_python = SpecifierSet(os.environ.get("_PEX_REQUIRES_PYTHON", ">=2.7"))
     dist = dist_metadata.find_distribution("pex")  # type: Optional[Distribution]
     if dist and dist.metadata.version == Version(__version__):
         pex_requires_python = dist.metadata.requires_python

{pex-2.59.2 → pex-2.59.4}/pex/version.py

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

{pex-2.59.2 → pex-2.59.4}/pex/wheel.py

@@ -87,7 +87,16 @@ class WHEEL(object):
         # type: () -> Tuple[tags.Tag, ...]
         return tuple(
             itertools.chain.from_iterable(
-                tags.parse_tag(tag) for tag in self.metadata.get_all("Tag", ())
+                # N.B.: There should be just 1 tag per Tag entry per items 7 and 11 in
+                # https://packaging.python.org/en/latest/specifications/binary-distribution-format/#file-contents
+                # There are wheels in the wild though with WHEEL metadata Tag entries that contain
+                # compressed tags instead of having the tags expanded to 1 per Tag. Although
+                # `tags.parse_tag` handles expansion of the compressed tags, it collects them in
+                # a frozenset with unstable order which can cause issues when attempting to
+                # construct stable wheel names from these tags; as such, we do the sort here as a
+                # defense against this style of bad WHEEL Tag metadata.
+                sorted(tags.parse_tag(tag), key=lambda tag: str(tag))
+                for tag in self.metadata.get_all("Tag", ())
             )
         )
 

{pex-2.59.2 → pex-2.59.4}/pyproject.toml

@@ -256,11 +256,15 @@ hidden = true
 
 [tool.dev-cmd.commands.format]
 description = "Auto-format the source code."
-when = "python_version >= '3.9'"
+# N.B.: Our old version of black does not run under 3.14; so we pin to 3.11 for now to cover all
+# cases.
+python = "python3.11"
 args = ["scripts/format.py"]
 
 [tool.dev-cmd.commands.format-check]
-when = "python_version >= '3.9'"
+# N.B.: Our old version of black does not run under 3.14; so we pin to 3.11 for now to cover all
+# cases.
+python = "python3.11"
 args = ["scripts/format.py", "--check"]
 hidden = true
 
@@ -270,6 +274,7 @@ args = ["scripts/gen-scie-platform.py"]
 accepts-extra-args = true
 dependency-group = "gen-scie-platform"
 hidden = true
+
 [tool.dev-cmd.commands.gen-scie-platform.env]
 PYTHONPATH = "."
 # Used to get wheels for armv7l and riscv64.

{pex-2.59.2 → pex-2.59.4}/testing/bin/run_tests.py

@@ -49,7 +49,7 @@ from pex.compatibility import urlparse
 from pex.fs import safe_rename
 from pex.typing import TYPE_CHECKING, cast
 from pex.util import named_temporary_file
-from testing import devpi, pex_project_dir
+from testing import devpi, pex_dist, pex_project_dir
 
 if TYPE_CHECKING:
     from typing import Iterator, Optional, Tuple
@@ -266,6 +266,8 @@ def main():
 
     args = [sys.executable, "-m", "pytest", "-n", "auto", "-p", "testing.pytest_utils.shard"]
 
+    os.environ["_PEX_REQUIRES_PYTHON"] = pex_dist.requires_python()
+
     # When run under dev-cmd, FORCE_COLOR=1 is set to propagate auto-detection of a color terminal.
     # This affects a handful of our tests; so we discard and let the --color option below control
     # our own color output.

{pex-2.59.2 → pex-2.59.4}/testing/pex_dist.py

@@ -9,7 +9,9 @@ import os
 
 from pex import hashing
 from pex.atomic_directory import atomic_directory
+from pex.compatibility import ConfigParser
 from pex.pip.version import PipVersion
+from pex.typing import cast
 from pex.util import CacheHelper
 from pex.venv.virtualenv import InstallationChoice, Virtualenv
 from pex.version import __version__
@@ -73,3 +75,15 @@ def wheel():
     return os.path.join(
         pex_wheel_dir, "pex-{version}-py2.py3-none-any.whl".format(version=__version__)
     )
+
+
+def requires_python():
+    # type: () -> str
+
+    requires_python_override = os.environ.get("_PEX_REQUIRES_PYTHON")
+    if requires_python_override:
+        return requires_python_override
+
+    config_parser = ConfigParser()
+    config_parser.read(os.path.join(pex_project_dir(), "setup.cfg"))
+    return cast(str, config_parser.get("options", "python_requires"))

{pex-2.59.2 → pex-2.59.4}/tests/bin/test_sh_boot.py

@@ -1,12 +1,8 @@
 # Copyright 2022 Pex project contributors.
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-import os
-
-import pytest
 
 from pex import sh_boot
-from pex.compatibility import ConfigParser
 from pex.interpreter import PythonInterpreter
 from pex.interpreter_constraints import InterpreterConstraints, iter_compatible_versions
 from pex.interpreter_implementation import InterpreterImplementation
@@ -17,7 +13,7 @@ from pex.resolve import abbreviated_platforms
 from pex.sh_boot import PythonBinaryName
 from pex.targets import CompletePlatform, Targets
 from pex.third_party.packaging.specifiers import SpecifierSet
-from pex.typing import TYPE_CHECKING, cast
+from pex.typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing import Iterable, List
@@ -35,20 +31,8 @@ def calculate_binary_names(
     )
 
 
-@pytest.fixture
-def requires_python(pex_project_dir):
-    # type: (str) -> str
-    requires_python = os.environ.get("_PEX_REQUIRES_PYTHON")
-    if requires_python:
-        return requires_python
-
-    config_parser = ConfigParser()
-    config_parser.read(os.path.join(pex_project_dir, "setup.cfg"))
-    return cast(str, config_parser.get("options", "python_requires"))
-
-
 def expected(
-    requires_python,  # type: str
+    pex_requires_python,  # type: str
     *names  # type: PythonBinaryName
 ):
     # type: (...) -> List[str]
@@ -67,7 +51,10 @@ def expected(
         all_names.add(current_interpreter_identity.binary_name(version_components=2))
 
     supported_versions = sorted(
-        (version[:2] for version in set(iter_compatible_versions([SpecifierSet(requires_python)]))),
+        (
+            version[:2]
+            for version in set(iter_compatible_versions([SpecifierSet(pex_requires_python)]))
+        ),
         reverse=True,  # Newest (highest) version 1st.
     )
     for exe_name in "python", "pypy":
@@ -103,17 +90,17 @@ def expected(
     return list(all_names)
 
 
-def test_calculate_no_targets_no_ics(requires_python):
+def test_calculate_no_targets_no_ics(pex_requires_python):
     # type: (str) -> None
 
-    assert expected(requires_python) == calculate_binary_names()
+    assert expected(pex_requires_python) == calculate_binary_names()
 
 
-def test_calculate_platforms_no_ics(requires_python):
+def test_calculate_platforms_no_ics(pex_requires_python):
     # type: (str) -> None
 
     assert expected(
-        requires_python,
+        pex_requires_python,
         PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(3, 6)),
         PythonBinaryName(implementation=InterpreterImplementation.PYPY, version=(2, 7)),
     ) == calculate_binary_names(
@@ -127,7 +114,7 @@ def test_calculate_platforms_no_ics(requires_python):
 
 
 def test_calculate_interpreters_no_ics(
-    requires_python,  # type: str
+    pex_requires_python,  # type: str
     py27,  # type: PythonInterpreter
     py311,  # type: PythonInterpreter
     py310,  # type: PythonInterpreter
@@ -136,7 +123,7 @@ def test_calculate_interpreters_no_ics(
 
     assert (
         expected(
-            requires_python,
+            pex_requires_python,
             PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(2, 7)),
             PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(3, 11)),
             PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(3, 10)),
@@ -145,12 +132,12 @@ def test_calculate_interpreters_no_ics(
     )
 
 
-def test_calculate_no_targets_ics(requires_python):
+def test_calculate_no_targets_ics(pex_requires_python):
     # type: (str) -> None
 
     assert (
         expected(
-            requires_python,
+            pex_requires_python,
             PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(3, 7)),
             PythonBinaryName(implementation=InterpreterImplementation.PYPY, version=(3, 7)),
             PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(3, 8)),
@@ -164,13 +151,13 @@ def test_calculate_no_targets_ics(requires_python):
 
 
 def test_calculate_mixed(
-    requires_python,  # type: str
+    pex_requires_python,  # type: str
     py27,  # type: PythonInterpreter
 ):
     # type: (...) -> None
 
     assert expected(
-        requires_python,
+        pex_requires_python,
         PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(2, 7)),
         PythonBinaryName(implementation=InterpreterImplementation.PYPY, version=(3, 8)),
         PythonBinaryName(implementation=InterpreterImplementation.CPYTHON, version=(3, 6)),

{pex-2.59.2 → pex-2.59.4}/tests/conftest.py

@@ -34,6 +34,12 @@ def pex_wheel():
     return pex_dist.wheel()
 
 
+@pytest.fixture(scope="session")
+def pex_requires_python():
+    # type: () -> str
+    return pex_dist.requires_python()
+
+
 @pytest.fixture(scope="session")
 def tmpdir_factory(request):
     # type: (FixtureRequest) -> tmp.TempdirFactory

{pex-2.59.2 → pex-2.59.4}/tests/integration/cli/commands/test_pep_751.py

@@ -321,7 +321,8 @@ def iter_expected_devpi_server_deps(interpreter):
 
 
 @pytest.mark.skipif(
-    sys.version_info[:2] < (3, 10), reason="The lock under test requires Python >= 3.10."
+    sys.version_info[:2] < (3, 10) or sys.version_info[:2] >= (3, 14),
+    reason="The lock under test requires Python >=3.10,<3.14.",
 )
 def test_universal_export_interop(
     tmpdir,  # type: Tempdir
@@ -348,8 +349,7 @@ def test_universal_export_interop(
 
     assert_valid_toml(result.output)
 
-    interpreter = PythonInterpreter.get() if sys.version_info[:2] < (3, 14) else py310
-
+    interpreter = PythonInterpreter.get()
     venv_dir = tmpdir.join("venv")
     venv = Virtualenv.create(venv_dir=venv_dir, interpreter=interpreter)
     assert [] == list(venv.iter_distributions())

pex-2.59.4/tests/integration/resolve/test_issue_2926.py

@@ -0,0 +1,81 @@
+# Copyright 2025 Pex project contributors.
+# Licensed under the Apache License, Version 2.0 (see LICENSE).
+
+from __future__ import absolute_import
+
+import os
+import subprocess
+import sys
+
+import pytest
+
+from pex.compatibility import commonpath
+from pex.venv.virtualenv import InstallationChoice, Virtualenv
+from testing import IS_LINUX, IS_PYPY, run_pex_command
+from testing.pytest_utils.tmp import Tempdir
+
+
+@pytest.mark.skipif(
+    IS_PYPY or sys.version_info[:2] < (3, 7) or not IS_LINUX,
+    reason=(
+        "The hf-xet 1.1.10 distribution only has wheels available for CPython >= 3.7 and this test "
+        "needs wheels with compressed tag sets which are only available for Linux."
+    ),
+)
+def test_bad_wheel_tag_metadata(tmpdir):
+    # type: (Tempdir) -> None
+
+    venv = Virtualenv.create(tmpdir.join("venv"), install_pip=InstallationChoice.YES)
+    subprocess.check_call(args=[venv.interpreter.binary, "-mpip", "install", "hf-xet==1.1.10"])
+
+    pex_root = tmpdir.join("pex-root")
+    pex = tmpdir.join("pex.packed")
+    run_pex_command(
+        args=[
+            "--pex-root",
+            pex_root,
+            "--runtime-pex-root",
+            pex_root,
+            "--venv-repository",
+            venv.venv_dir,
+            "--layout",
+            "packed",
+            "-o",
+            pex,
+        ]
+    ).assert_success()
+
+    path = (
+        subprocess.check_output(
+            args=[sys.executable, pex, "-c", "import hf_xet; print(hf_xet.__file__)"]
+        )
+        .decode("utf-8")
+        .strip()
+    )
+    assert pex_root == commonpath((pex_root, path))
+
+    # N.B.: The original wheel on PyPI is
+    # hf-xet-1.1.10-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl and the WHEEL
+    # metadata is:
+    # ---
+    # Wheel-Version: 1.0
+    # Generator: maturin (1.9.4)
+    # Root-Is-Purelib: false
+    # Tag: cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64
+    #
+    # That WHEEL metadata should be:
+    # ---
+    # Wheel-Version: 1.0
+    # Generator: maturin (1.9.4)
+    # Root-Is-Purelib: false
+    # Tag: cp37-abi3-manylinux_2_17_x86_64
+    # Tag: cp37-abi3-manylinux2014_x86_64
+    #
+    # We use packaging.tags.parse_tag on the `cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64`
+    # Tag though which handles the compressed tag, but produces a frozenset of
+    # `cp37-abi3-manylinux_2_17_x86_64` and `cp37-abi3-manylinux2014_x86_64` which is right, but
+    # only up to ordering, which is unstable. We sort the tags to stabilize which results in the
+    # `manylinux2014_x86_64` platform tag now coming 1st unlike in the original wheel.
+    assert "hf-xet-1.1.10-cp37-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl" in path.split(
+        os.sep
+    )

pex-2.59.4/tests/integration/resolve/test_issue_2930.py

@@ -0,0 +1,78 @@
+# Copyright 2025 Pex project contributors.
+# Licensed under the Apache License, Version 2.0 (see LICENSE).
+
+from __future__ import absolute_import
+
+import os.path
+import subprocess
+
+from pex.pep_440 import Version
+from pex.pep_503 import ProjectName
+from pex.typing import TYPE_CHECKING
+from pex.venv.virtualenv import InstallationChoice, Virtualenv
+from testing import run_pex_command
+from testing.pytest_utils.tmp import Tempdir
+
+if TYPE_CHECKING:
+    from typing import Dict, Text
+
+
+def create_venv(
+    venv_dir,  # type: str
+    *requirements  # type: str
+):
+    # type: (...) -> Virtualenv
+    venv = Virtualenv.create(venv_dir, install_pip=InstallationChoice.YES)
+    subprocess.check_call(args=[venv.interpreter.binary, "-mpip", "install"] + list(requirements))
+    return venv
+
+
+def index_venv(venv):
+    # type: (Virtualenv) -> Dict[ProjectName, Version]
+    return {
+        dist.metadata.project_name: dist.metadata.version
+        for dist in venv.iter_distributions(rescan=True)
+    }
+
+
+def test_same_wheel_resolved_from_multiple_venvs(tmpdir):
+    # type: (Tempdir) -> None
+
+    venv1 = create_venv(tmpdir.join("venv1"), "wheel")
+    venv2 = create_venv(tmpdir.join("venv2"), "wheel")
+    venv3 = create_venv(tmpdir.join("venv3"), "wheel")
+
+    venv1_contents = index_venv(venv1)
+    assert venv1_contents == index_venv(venv2)
+    assert venv1_contents == index_venv(venv3)
+
+    pex_root = tmpdir.join("pex-root")
+    pex = tmpdir.join("pex")
+
+    def assert_create_pex(venv):
+        # type: (Virtualenv) -> Text
+
+        run_pex_command(
+            args=[
+                "--pex-root",
+                pex_root,
+                "--runtime-pex-root",
+                pex_root,
+                "--venv-repository",
+                venv.venv_dir,
+                "-o",
+                pex,
+            ]
+        ).assert_success()
+
+        # N.B.: We take the dirname since wheel.__file__ will report the .pyc instead of the
+        # .py after 1st use under Python 2.7.
+        return os.path.dirname(
+            subprocess.check_output(args=[pex, "-c", "import wheel; print(wheel.__file__)"])
+            .decode("utf-8")
+            .strip()
+        )
+
+    wheel1_path = assert_create_pex(venv1)
+    assert wheel1_path == assert_create_pex(venv2)
+    assert wheel1_path == assert_create_pex(venv3)

{pex-2.59.2 → pex-2.59.4}/tests/integration/scie/test_pex_scie.py

@@ -100,7 +100,7 @@ def test_basic(
             re_flags=re.DOTALL | re.MULTILINE,
         )
         return
-    if PY_VER >= (3, 14):
+    if PY_VER >= (3, 15):
         result.assert_failure(
             expected_error_re=(
                 r".*"