pex 2.92.0__tar.gz → 2.92.2__tar.gz

{pex-2.92.0 → pex-2.92.2}/CHANGES.md

@@ -1,5 +1,20 @@
 # Release Notes
 
+## 2.92.2
+
+This release fixes `pex3 lock create --avoid-downloads` hashing of VCS requirements where the VCS
+repository contains symlinks. Previously the hash calculated at lock create time would always
+mismatch the hash calculated at lock use time.
+
+* Fix VCS hashing in the face of symlinks. (#3149)
+
+## 2.92.1
+
+This release fixes a caching bug introduced in #2766 that led to sdists always being rebuilt when
+needed for a PEX.
+
+* Always cache sdist builds. (#3144)
+
 ## 2.92.0
 
 This release supports Pip's new [`--uploaded-prior-to`](https://pip.pypa.io/en/stable/user_guide/#filtering-by-upload-time).

{pex-2.92.0 → pex-2.92.2}/PKG-INFO

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

{pex-2.92.0 → pex-2.92.2}/docker/base/install_pythons.sh

@@ -15,9 +15,9 @@ DEADSNAKES_VERSIONS=(
   "3.9 {dev,venv,distutils}=3.9.25"
   "3.10 {dev,venv,distutils}=3.10.20"
   "3.11 {dev,venv,distutils}=3.11.15"
-  "3.13 {dev,venv}=3.13.12"
-  "3.14 {dev,venv}=3.14.3"
-  "3.15 {dev,venv}=3.15.0~a7"
+  "3.13 {dev,venv}=3.13.13"
+  "3.14 {dev,venv}=3.14.4"
+  "3.15 {dev,venv}=3.15.0~a8"
 )
 
 add-apt-repository --yes --ppa deadsnakes

{pex-2.92.0 → pex-2.92.2}/pex/cache/dirs.py

@@ -144,6 +144,16 @@ class CacheDir(Enum["CacheDir.Value"]):
         description="Distributions downloaded when resolving from a Pex lock file.",
     )
 
+    EXTRACTED_SDISTS = Value(
+        "extracted_sdists",
+        version=0,
+        name="Extracted Source Distributions",
+        description=(
+            "Source distributions that have been extracted to expose a Python project subdirectory "
+            "for building wheels from."
+        ),
+    )
+
     INSTALLED_WHEELS = Value(
         "installed_wheels",
         version=2,

{pex-2.92.0 → pex-2.92.2}/pex/hashing.py

@@ -232,6 +232,7 @@ def dir_hash(
     digest,  # type: HintedDigest
     dir_filter=lambda d: True,  # type: Callable[[Text], bool]
     file_filter=lambda f: True,  # type: Callable[[Text], bool]
+    followlinks=True,  # type: bool
 ):
     # type: (...) -> None
     """Digest the contents of a directory in a reproducible manner."""
@@ -240,7 +241,7 @@ def dir_hash(
 
         def iter_files():
             # type: () -> Iterator[Text]
-            for root, dirs, files in os.walk(top, followlinks=True):
+            for root, dirs, files in os.walk(top, followlinks=followlinks):
                 dirs[:] = [
                     d for d in dirs if dir_filter(os.path.relpath(os.path.join(root, d), top))
                 ]

{pex-2.92.0 → pex-2.92.2}/pex/interpreter_constraints.py

@@ -394,8 +394,8 @@ COMPATIBLE_PYTHON_VERSIONS = (
     PythonVersion(Lifecycle.STABLE, 3, 10, 20),
     PythonVersion(Lifecycle.STABLE, 3, 11, 15),
     PythonVersion(Lifecycle.STABLE, 3, 12, 13),
-    PythonVersion(Lifecycle.STABLE, 3, 13, 12),
-    PythonVersion(Lifecycle.STABLE, 3, 14, 3),
+    PythonVersion(Lifecycle.STABLE, 3, 13, 13),
+    PythonVersion(Lifecycle.STABLE, 3, 14, 4),
     PythonVersion(Lifecycle.DEV, 3, 15, 0),
 )
 

{pex-2.92.0 → pex-2.92.2}/pex/pip/vcs.py

@@ -176,4 +176,5 @@ def digest_vcs_repo(
         digest=digest,
         dir_filter=_vcs_dir_filter(vcs, project_name),
         file_filter=_vcs_file_filter(vcs),
+        followlinks=False,
     )

{pex-2.92.0 → pex-2.92.2}/pex/resolve/lockfile/create.py

@@ -274,7 +274,7 @@ class LockError(Exception):
 
 def _prepare_project_directory(build_request):
     # type: (BuildRequest) -> Tuple[Target, str]
-    project_path, _ = build_request.prepare()
+    project_path, _ = build_request.prepare(ensure_extracted=True)
     return build_request.target, project_path
 
 

{pex-2.92.0 → pex-2.92.2}/pex/resolve/pep_691/fingerprint_service.py

@@ -33,7 +33,7 @@ else:
 
 
 @attr.s(frozen=True)
-class _FingerprintedURL(object):
+class FingerprintedURL(object):
     url = attr.ib()  # type: str
     fingerprint = attr.ib()  # type: Fingerprint
 
@@ -87,7 +87,7 @@ class FingerprintService(object):
             yield conn
 
     def _iter_cached(self, urls_to_fingerprint):
-        # type: (Iterable[str]) -> Iterator[_FingerprintedURL]
+        # type: (Iterable[str]) -> Iterator[FingerprintedURL]
 
         urls = sorted(urls_to_fingerprint)
         with TRACER.timed("Searching for {count} fingerprints in database".format(count=len(urls))):
@@ -106,12 +106,12 @@ class FingerprintService(object):
                         )
                     ) as cursor:
                         for url, algorithm, hash_ in cursor:
-                            yield _FingerprintedURL(
+                            yield FingerprintedURL(
                                 url=url, fingerprint=Fingerprint(algorithm=algorithm, hash=hash_)
                             )
 
-    def _cache(self, fingerprinted_urls):
-        # type: (Sequence[_FingerprintedURL]) -> None
+    def cache(self, fingerprinted_urls):
+        # type: (Sequence[FingerprintedURL]) -> None
 
         with TRACER.timed(
             "Caching {count} fingerprints in database".format(count=len(fingerprinted_urls))
@@ -219,7 +219,7 @@ class FingerprintService(object):
                 pool.close()
                 pool.join()
 
-        fingerprinted_urls = []  # type: List[_FingerprintedURL]
+        fingerprinted_urls = []  # type: List[FingerprintedURL]
         for result in api_results:
             if isinstance(result, Error):
                 pex_warnings.warn(
@@ -236,9 +236,7 @@ class FingerprintService(object):
                 yield attr.evolve(fingerprinted_artifact, fingerprint=maybe_fingerprint)
                 if maybe_fingerprint:
                     fingerprinted_urls.append(
-                        _FingerprintedURL(
-                            url=file.url.normalized_url, fingerprint=maybe_fingerprint
-                        )
+                        FingerprintedURL(url=file.url.normalized_url, fingerprint=maybe_fingerprint)
                     )
 
         # The remaining artifacts have no fingerprint and no endpoint to fetch the data from; so we
@@ -250,7 +248,7 @@ class FingerprintService(object):
             return
 
         try:
-            self._cache(fingerprinted_urls)
+            self.cache(fingerprinted_urls)
         except sqlite3.DatabaseError as e:
             self._warn_database_error(
                 error=e,

{pex-2.92.0 → pex-2.92.2}/pex/resolver.py

@@ -681,38 +681,50 @@ class BuildRequest(object):
         # type: () -> Target
         return self.download_target.target
 
-    def prepare(self):
-        # type: () -> Tuple[str, bool]
+    def prepare(self, ensure_extracted=False):
+        # type: (bool) -> Tuple[str, bool]
 
-        if os.path.isdir(self.source_path):
-            if self.subdirectory:
-                return os.path.join(self.source_path, self.subdirectory), self.editable
+        if not ensure_extracted and not self.subdirectory:
             return self.source_path, self.editable
 
-        extract_dir = os.path.join(safe_mkdtemp(), "project")
-        if is_zip_sdist(self.source_path):
-            with open_zip(self.source_path) as zf:
-                zf.extractall(extract_dir)
-
-            listing = os.listdir(extract_dir)
-            if len(listing) != 1:
-                raise BuildError(
-                    "Expected one top-level project directory to be extracted from {project}, "
-                    "found {count}: {listing}".format(
-                        project=self.source_path, count=len(listing), listing=", ".join(listing)
-                    )
-                )
-            project_directory = os.path.join(extract_dir, listing[0])
+        if os.path.isdir(self.source_path):
+            project = self.source_path
             if self.subdirectory:
-                project_directory = os.path.join(project_directory, self.subdirectory)
-            return project_directory, False
-
-        if is_tar_sdist(self.source_path):
-            return sdist.extract_tarball(self.source_path, dest_dir=extract_dir), False
+                project = os.path.join(project, self.subdirectory)
+            return project, self.editable
 
-        raise BuildError(
-            "Unexpected archive type for sdist {project}".format(project=self.source_path)
+        # We use `pip wheel ...` to build sdsists but there is no way to pass a subdirectory to
+        # that; so we hand-prepare a loose source subdirectory here that `pip wheel` can handle.
+        extracted_sdist = CacheDir.EXTRACTED_SDISTS.path(
+            self.fingerprint or _fingerprint_file(self.source_path)
         )
+        with atomic_directory(extracted_sdist) as atomic_dir:
+            if not atomic_dir.is_finalized():
+                if is_zip_sdist(self.source_path):
+                    with open_zip(self.source_path) as zf:
+                        zf.extractall(atomic_dir.work_dir)
+                elif is_tar_sdist(self.source_path):
+                    sdist.extract_tarball(self.source_path, dest_dir=atomic_dir.work_dir)
+                else:
+                    raise BuildError(
+                        "Unexpected archive type for sdist {project}".format(
+                            project=self.source_path
+                        )
+                    )
+                listing = os.listdir(atomic_dir.work_dir)
+                if len(listing) != 1:
+                    raise BuildError(
+                        "Expected one top-level project directory to be extracted from {project}, "
+                        "found {count}: {listing}".format(
+                            project=self.source_path, count=len(listing), listing=", ".join(listing)
+                        )
+                    )
+
+        listing = os.listdir(extracted_sdist)
+        project = os.path.join(extracted_sdist, listing[0])
+        if self.subdirectory:
+            project = os.path.join(project, self.subdirectory)
+        return project, False
 
     def result(
         self,
@@ -1074,6 +1086,13 @@ class WheelBuilder(object):
         build_result = build_request.result(
             source_path, honor_editable=self._build_configuration.honor_editable
         )
+        if build_result.is_built:
+            TRACER.log(
+                "Using cached build of {} at {}".format(
+                    build_request.source_path, build_result.dist_dir
+                )
+            )
+            return SpawnedJob.completed(build_result)
 
         def spawn_build_wheel():
             # type: () -> SpawnedJob[BuildResult]

{pex-2.92.0 → pex-2.92.2}/pex/version.py

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

{pex-2.92.0 → pex-2.92.2}/tests/integration/cli/commands/test_issue_2414.py

@@ -13,9 +13,10 @@ from pex.requirements import parse_requirement_string
 from pex.resolve.configured_resolver import ConfiguredResolver
 from pex.resolve.locked_resolve import LockStyle
 from pex.resolve.locker import Locker, LockResult
+from pex.resolve.pep_691.fingerprint_service import FingerprintedURL, FingerprintService
 from pex.resolve.resolved_requirement import PartialArtifact, Pin, ResolvedRequirement
 from pex.targets import LocalInterpreter
-from pex.typing import TYPE_CHECKING
+from pex.typing import TYPE_CHECKING, cast
 from testing import data
 
 if TYPE_CHECKING:
@@ -23,8 +24,18 @@ if TYPE_CHECKING:
 
 
 @pytest.fixture
-def locker(tmpdir):
-    # type: (Any) -> Locker
+def fingerprint_service(tmpdir):
+    # type: (Any) -> FingerprintService
+    db_dir = os.path.join(str(tmpdir), "fingerprints")
+    return FingerprintService(db_dir=db_dir)
+
+
+@pytest.fixture
+def locker(
+    tmpdir,  # type: Any
+    fingerprint_service,  # type: FingerprintService
+):
+    # type: (...) -> Locker
     download_dir = os.path.join(str(tmpdir), "downloads")
     return Locker(
         target=LocalInterpreter.create(),
@@ -32,6 +43,7 @@ def locker(tmpdir):
         resolver=ConfiguredResolver.default(),
         lock_style=LockStyle.SOURCES,
         download_dir=download_dir,
+        fingerprint_service=fingerprint_service,
         lock_is_via_pip_download=True,
     )
 
@@ -52,11 +64,10 @@ def analyze_log(
 def test_redirects_dont_stomp_original_index_urls(
     pip_version,  # type: str
     locker,  # type: Locker
+    fingerprint_service,  # type: FingerprintService
 ):
     # type: (...) -> None
 
-    analyze_log(locker, "issue-2414.pip-{pip_version}.log".format(pip_version=pip_version))
-
     expected_whl_artifact = PartialArtifact(
         url=ArtifactURL.parse(
             "https://m.devpi.net/root/pypi/%2Bf/55c/570405f142630/wheel-0.43.0-py3-none-any.whl"
@@ -77,6 +88,22 @@ def test_redirects_dont_stomp_original_index_urls(
         ),
         verified=False,
     )
+
+    fingerprint_service.cache(
+        [
+            FingerprintedURL(
+                url=expected_whl_artifact.url.normalized_url,
+                fingerprint=cast(Fingerprint, expected_whl_artifact.fingerprint),
+            ),
+            FingerprintedURL(
+                url=expected_sdist_artifact.url.normalized_url,
+                fingerprint=cast(Fingerprint, expected_sdist_artifact.fingerprint),
+            ),
+        ]
+    )
+
+    analyze_log(locker, "issue-2414.pip-{pip_version}.log".format(pip_version=pip_version))
+
     expected_wheel_requirement = ResolvedRequirement(
         pin=Pin(ProjectName("wheel"), Version("0.43.0")),
         artifact=expected_whl_artifact,

pex-2.92.2/tests/integration/cli/commands/test_issue_3148.py

@@ -0,0 +1,66 @@
+# Copyright 2026 Pex project contributors.
+# Licensed under the Apache License, Version 2.0 (see LICENSE).
+
+from __future__ import absolute_import
+
+import filecmp
+
+from testing import PY311, ensure_python_interpreter, run_pex_command
+from testing.cli import run_pex3
+from testing.pytest_utils.tmp import Tempdir
+
+
+def lock_nautobot(lock_file, *extra_lock_args):
+    args = [
+        "lock",
+        "create",
+        "nautobot @ git+https://github.com/utsc-networking/nautobot@utsc-custom",
+        "--intransitive",
+        "--pip-version",
+        "latest-compatible",
+        "--indent",
+        "2",
+        "-o",
+        lock_file,
+    ]
+    run_pex3(*(args + list(extra_lock_args))).assert_success()
+
+
+def test_issue_3148(tmpdir):
+    # type: (Tempdir) -> None
+
+    python311 = ensure_python_interpreter(PY311)
+
+    lock_avoid_downloads = tmpdir.join("lock.avoid-downloads.json")
+    lock_nautobot(lock_avoid_downloads, "--python", python311, "--avoid-downloads")
+    pex_avoid_downloads = tmpdir.join("avoid-downloads.pex")
+    run_pex_command(
+        args=[
+            "--python",
+            python311,
+            "--lock",
+            lock_avoid_downloads,
+            "--intransitive",
+            "-o",
+            pex_avoid_downloads,
+        ],
+        python=python311,
+    ).assert_success()
+
+    lock_no_avoid_downloads = tmpdir.join("lock.no-avoid-downloads.json")
+    lock_nautobot(lock_no_avoid_downloads, "--python", python311, "--no-avoid-downloads")
+    pex_no_avoid_downloads = tmpdir.join("no-avoid-downloads.pex")
+    run_pex_command(
+        args=[
+            "--python",
+            python311,
+            "--lock",
+            lock_no_avoid_downloads,
+            "--intransitive",
+            "-o",
+            pex_no_avoid_downloads,
+        ],
+    ).assert_success()
+
+    assert filecmp.cmp(lock_avoid_downloads, lock_no_avoid_downloads, shallow=False)
+    assert filecmp.cmp(pex_avoid_downloads, pex_no_avoid_downloads, shallow=False)