pex 2.67.0__tar.gz → 2.67.2__tar.gz

{pex-2.67.0 → pex-2.67.2}/CHANGES.md

@@ -1,5 +1,18 @@
 # Release Notes
 
+## 2.67.2
+
+This release fixes a bug resolving editable projects from `--venv-repository`s.
+
+* Fix resolve of editables from `--venv-repository`s. (#2984)
+
+## 2.67.1
+
+This release fixes a bug subsetting `--venv-repository` resolves when top-level requirements
+had version specifiers; e.g.: `thing>2`.
+
+* Fix `--venv-repository` subsetting. (#2981)
+
 ## 2.67.0
 
 This release adds support for specifying multiple `--venv-repository`s when building a PEX. This

{pex-2.67.0 → pex-2.67.2}/PKG-INFO

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

{pex-2.67.0 → pex-2.67.2}/pex/dist_metadata.py

@@ -9,6 +9,7 @@ import functools
 import glob
 import importlib
 import itertools
+import json
 import os
 import sys
 import tarfile
@@ -22,7 +23,7 @@ from textwrap import dedent
 
 from pex import pex_warnings, specifier_sets
 from pex.common import open_zip, pluralize
-from pex.compatibility import PY2, to_unicode
+from pex.compatibility import PY2, string, to_unicode
 from pex.enum import Enum
 from pex.exceptions import reportable_unexpected_error_msg
 from pex.pep_440 import Version
@@ -780,7 +781,7 @@ class Constraint(object):
         )
 
     name = attr.ib(eq=False)  # type: str
-    specifier = attr.ib(factory=SpecifierSet)  # type: SpecifierSet
+    specifier = attr.ib(factory=SpecifierSet, order=False)  # type: SpecifierSet
     marker = attr.ib(default=None, eq=str)  # type: Optional[Marker]
 
     project_name = attr.ib(init=False, repr=False)  # type: ProjectName
@@ -1193,6 +1194,32 @@ class Distribution(object):
             source=os.path.join(self.metadata.files.metadata.location, entry_points_txt_relpath),
         )
 
+    def editable_install_url(self):
+        # type: () -> Optional[Text]
+
+        # For the spec, see: https://peps.python.org/pep-0660/#frontend-requirements
+        direct_url_json_bytes = self._read_metadata_file("direct_url.json")
+        if not direct_url_json_bytes:
+            return None
+
+        direct_url_json_data = json.loads(direct_url_json_bytes)
+        if not direct_url_json_data.get("dir_info", {}).get("editable", False):
+            return None
+
+        url = direct_url_json_data.get("url", None)
+        if url is None:
+            return None
+
+        if not isinstance(url, string):
+            raise InvalidMetadataError(
+                "The direct_url.json metadata for {dist} at {location} is invalid.\n"
+                "Expected `url` to be a string but found {value} of type {type}".format(
+                    dist=self, location=self.location, value=url, type=type(url)
+                )
+            )
+
+        return cast("Text", url)
+
     def __str__(self):
         # type: () -> str
         return "{project_name} {version}".format(

{pex-2.67.0 → pex-2.67.2}/pex/resolve/venv_resolver.py

@@ -380,7 +380,11 @@ def _resolve_distributions(
         elif meets_requirement(distribution, requirement):
             production_assert(distribution.type is DistributionType.INSTALLED)
             resolved.add(requirement.project_name)
-            if distribution.metadata.files.metadata.type is MetadataType.DIST_INFO:
+            editable_project_url = distribution.editable_install_url()
+            if (
+                not editable_project_url
+                and distribution.metadata.files.metadata.type is MetadataType.DIST_INFO
+            ):
                 to_resolve.extend(
                     requirement.dependency(
                         requirement=dependency,
@@ -391,8 +395,15 @@ def _resolve_distributions(
                 )
                 yield distribution
             else:
+                source_requirement = (
+                    "{project} @ {url}".format(
+                        project=distribution.metadata.project_name, url=editable_project_url
+                    )
+                    if editable_project_url
+                    else str(distribution.as_requirement())
+                )
                 result = resolver.resolve_requirements(
-                    requirements=[str(distribution.as_requirement())],
+                    requirements=[source_requirement],
                     targets=Targets.from_target(target),
                     transitive=False,
                     compile=compile,
@@ -542,7 +553,17 @@ def _resolve_from_venv(
             if venv_distribution.metadata.files.metadata.type is not MetadataType.DIST_INFO:
                 sdists_to_resolve.append(str(venv_distribution.as_requirement()))
             else:
-                venv_distributions.append(venv_distribution)
+                editable_project_url = venv_distribution.editable_install_url()
+                if editable_project_url:
+                    sdists_to_resolve.append(
+                        "{project_name} @ {url}".format(
+                            project_name=venv_distribution.metadata.project_name,
+                            url=editable_project_url,
+                        )
+                    )
+                else:
+                    venv_distributions.append(venv_distribution)
+
             direct_requirements_by_project_name[venv_distribution.metadata.project_name].add(
                 venv_distribution.as_requirement()
             )

{pex-2.67.0 → pex-2.67.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.67.0"
+__version__ = "2.67.2"

{pex-2.67.0 → pex-2.67.2}/testing/__init__.py

@@ -19,6 +19,7 @@ import pytest
 
 from pex.atomic_directory import atomic_directory
 from pex.common import open_zip, safe_mkdir, safe_mkdtemp, safe_rmtree, safe_sleep, temporary_dir
+from pex.compatibility import to_unicode
 from pex.dist_metadata import Distribution
 from pex.executor import Executor
 from pex.interpreter import PythonInterpreter
@@ -411,11 +412,9 @@ class IntegResults(object):
         re_flags=0,  # type: int
     ):
         # type: (...) -> None
-        assert (
-            self.return_code == 0
-        ), "integration test failed: return_code={}, output={}, error={}".format(
-            self.return_code, self.output, self.error
-        )
+        assert self.return_code == 0, to_unicode(
+            "integration test failed: return_code={return_code}, output={output}, error={error}"
+        ).format(return_code=self.return_code, output=self.output, error=self.error)
         self.assert_output(expected_output_re, expected_error_re, re_flags)
 
     def assert_failure(
@@ -435,17 +434,13 @@ class IntegResults(object):
         re_flags=0,  # type: int
     ):
         if expected_output_re:
-            assert re.match(
-                expected_output_re, self.output, flags=re_flags
-            ), "Failed to match re: {re!r} against:\n{output}".format(
-                re=expected_output_re, output=self.output
-            )
+            assert re.match(expected_output_re, self.output, flags=re_flags), to_unicode(
+                "Failed to match re: {re!r} against:\n{output}"
+            ).format(re=expected_output_re, output=self.output)
         if expected_error_re:
-            assert re.match(
-                expected_error_re, self.error, flags=re_flags
-            ), "Failed to match re: {re!r} against:\n{output}".format(
-                re=expected_error_re, output=self.error
-            )
+            assert re.match(expected_error_re, self.error, flags=re_flags), to_unicode(
+                "Failed to match re: {re!r} against:\n{output}"
+            ).format(re=expected_error_re, output=self.error)
 
 
 def create_pex_command(

pex-2.67.2/tests/integration/test_discussion_2979.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 json
+import os.path
+import shutil
+import subprocess
+from textwrap import dedent
+
+import pytest
+
+from pex.common import safe_open, touch
+from pex.compatibility import commonpath
+from pex.interpreter import PythonInterpreter
+from pex.venv.virtualenv import Virtualenv
+from testing import run_pex_command
+from testing.pytest_utils.tmp import Tempdir
+
+
+@pytest.fixture
+def project_dir(tmpdir):
+    # type: (Tempdir) -> str
+
+    project_dir = tmpdir.join("project")
+    with safe_open(os.path.join(project_dir, "pyproject.toml"), "w") as fp:
+        fp.write(
+            dedent(
+                """\
+                [build-system]
+                requires = ["uv_build>=0.9.6,<0.10.0"]
+                build-backend = "uv_build"
+
+                [project]
+                name = "project"
+                version = "0.42.0"
+                description = "Repro of https://github.com/pex-tool/pex/discussions/2979"
+                requires-python = "==3.10.*"
+                dependencies = [
+                    "anywidget<0.10.0,>=0.9.14",
+
+                    # Internal only.
+                    # "corr_module>=1.0.0",
+
+                    # Because only marketdata<=0.2.0 is available and your project depends on marketdata>=2.0.0,<3.0.0, we can conclude that your project's requirements are unsatisfiable.
+                    # "marketdata<3.0.0,>=2.0.0",
+                    "marketdata",
+
+                    "matplotlib<4.0.0,>=3.7.0",
+                    "numpy<3.0.0,>=2.2.3",
+                    "openpyxl<4.0.0,>=3.1.5",
+                    "plotly<6.0.0,>=5.24.1",
+                    "polars<2.0.0,>=1.32.3",
+                    "pyyaml<7.0.0,>=6.0.2",
+                    "scikit-learn<2.0.0,>=1.6.1",
+                    "scipy<2.0.0,>=1.15.0",
+                    "statsmodels<0.15.0,>=0.14.4",
+
+                    # Because only tsm>=8.0 is available and your project depends on tsm>=2.0.11,<3.0.0, we can conclude that your project's requirements are unsatisfiable.
+                    # "tsm<3.0.0,>=2.0.11",
+                    "tsm",
+
+                    # Internal only.
+                    # "utils-internal==1.0.11"
+                ]
+                """
+            )
+        )
+    touch(os.path.join(project_dir, "src", "project", "__init__.py"))
+    return project_dir
+
+
+@pytest.fixture
+def project_venv(project_dir):
+    # type: (str) -> Virtualenv
+
+    subprocess.check_call(args=["uv", "sync"], cwd=project_dir)
+    return Virtualenv(os.path.join(project_dir, ".venv"))
+
+
+def assert_project(
+    python,  # type: PythonInterpreter
+    pex_root,  # type: str
+    pex,  # type: str
+):
+    # type: (...) -> None
+
+    output = (
+        subprocess.check_output(
+            args=[
+                python.binary,
+                pex,
+                "-c",
+                dedent(
+                    """\
+                import json
+                import sys
+                from importlib import metadata
+
+                import project
+                import scipy
+
+
+                json.dump(
+                    {
+                        "project_path": project.__file__,
+                        "project_version": metadata.version("project"),
+                        "scipy_path": scipy.__file__,
+                    },
+                    sys.stdout,
+                )
+                """
+                ),
+            ]
+        )
+        .decode("utf-8")
+        .strip()
+    )
+
+    data = json.loads(output)
+    assert pex_root == commonpath((pex_root, data["project_path"]))
+    assert "0.42.0" == data["project_version"]
+    assert pex_root == commonpath((pex_root, data["scipy_path"]))
+
+
+def test_venv_subset_with_specifiers_discussion_op(
+    tmpdir,  # type: Tempdir
+    project_dir,  # type: str
+    project_venv,  # type: Virtualenv
+):
+    # type: (...) -> None
+
+    pex_root = tmpdir.join("pex-root")
+    pex = tmpdir.join("project.pex")
+    run_pex_command(
+        args=[
+            "--pex-root",
+            pex_root,
+            "--runtime-pex-root",
+            pex_root,
+            "--pip-version",
+            "latest-compatible",
+            "--venv-repository",
+            project_venv.venv_dir,
+            "scipy",
+            "--project",
+            project_dir,
+            "-o",
+            pex,
+            "--no-compress",
+        ],
+        python=project_venv.interpreter.binary,
+    ).assert_success()
+
+    assert_project(python=project_venv.interpreter, pex_root=pex_root, pex=pex)
+
+
+def test_editable_installs_subset_issue_2982(
+    tmpdir,  # type: Tempdir
+    project_dir,  # type: str
+    project_venv,  # type: Virtualenv
+    py310,  # type: PythonInterpreter
+):
+    # type: (...) -> None
+
+    pex_root = tmpdir.join("pex-root")
+    pex = tmpdir.join("project.pex")
+    run_pex_command(
+        args=[
+            "--pex-root",
+            pex_root,
+            "--runtime-pex-root",
+            pex_root,
+            "--pip-version",
+            "latest-compatible",
+            "--venv-repository",
+            project_venv.venv_dir,
+            "project",
+            "-o",
+            pex,
+            "--no-compress",
+        ],
+        python=project_venv.interpreter.binary,
+    ).assert_success()
+
+    shutil.rmtree(project_dir)
+    assert_project(python=py310, pex_root=pex_root, pex=pex)
+
+
+def test_editable_installs_full_resolve_issue_2982(
+    tmpdir,  # type: Tempdir
+    project_dir,  # type: str
+    project_venv,  # type: Virtualenv
+    py310,  # type: PythonInterpreter
+):
+    # type: (...) -> None
+
+    pex_root = tmpdir.join("pex-root")
+    pex = tmpdir.join("project.pex")
+    run_pex_command(
+        args=[
+            "--pex-root",
+            pex_root,
+            "--runtime-pex-root",
+            pex_root,
+            "--pip-version",
+            "latest-compatible",
+            "--venv-repository",
+            project_venv.venv_dir,
+            "-o",
+            pex,
+            "--no-compress",
+        ],
+        python=project_venv.interpreter.binary,
+    ).assert_success()
+
+    shutil.rmtree(project_dir)
+    assert_project(python=py310, pex_root=pex_root, pex=pex)