Fix pex3 wheel and add a test.

jsirois · jsirois · commit de12f143c0bf · 2026-03-09T13:10:22.000-07:00
diff --git a/pex/cli/commands/pip/core.py b/pex/cli/commands/pip/core.py
@@ -3,6 +3,7 @@
 
 from __future__ import absolute_import
 
+import os.path
 from argparse import Namespace, _ActionsContainer
 
 from pex import dependency_configuration
@@ -94,8 +95,14 @@ class SourceDist(object):
     subdirectory = attr.ib(default=None)  # type: Optional[str]
 
 
+@attr.s(frozen=True)
+class LocalProject(object):
+    path = attr.ib()  # type: str
+    editable = attr.ib()  # type: bool
+
+
 if TYPE_CHECKING:
-    Dist = Union[SourceDist, WheelDist]
+    Dist = Union[LocalProject, SourceDist, WheelDist]
     DownloadedItem = Union[DownloadedArtifact, LocalDistribution]
 
 
@@ -106,13 +113,15 @@ def to_dist(downloaded_artifact):
         # type: (DownloadedItem) -> Dist
         if is_wheel(downloaded_artifact.path):
             return WheelDist(downloaded_artifact.path)
+        if os.path.isdir(downloaded_artifact.path):
+            return LocalProject(downloaded_artifact.path, editable=downloaded_artifact.editable)
         return SourceDist(downloaded_artifact.path, subdirectory=downloaded_artifact.subdirectory)
 
     return tuple(map(to_dist, downloaded_artifacts))
 
 
 def download_distributions(configuration):
-    # type: (Configuration) -> Union[Tuple[Union[SourceDist, WheelDist], ...], Error]
+    # type: (Configuration) -> Union[Tuple[Union[LocalProject, SourceDist, WheelDist], ...], Error]
 
     requirement_configuration = configuration.requirement_configuration
     dep_configuration = configuration.dependency_configuration
diff --git a/pex/cli/commands/pip/download.py b/pex/cli/commands/pip/download.py
@@ -8,6 +8,7 @@
 
 from pex.cli.command import BuildTimeCommand
 from pex.cli.commands.pip import core
+from pex.cli.commands.pip.core import LocalProject
 from pex.common import safe_copy, safe_mkdir
 from pex.result import Ok, Result, try_
 
@@ -35,6 +36,8 @@ def run(self):
 
         safe_mkdir(self.options.dest_dir)
         for dist in dists:
+            if isinstance(dist, LocalProject):
+                continue
             safe_copy(dist.path, os.path.join(self.options.dest_dir, os.path.basename(dist.path)))
 
         return Ok()
diff --git a/pex/cli/commands/pip/wheel.py b/pex/cli/commands/pip/wheel.py
@@ -9,7 +9,7 @@
 
 from pex.cli.command import BuildTimeCommand
 from pex.cli.commands.pip import core
-from pex.cli.commands.pip.core import SourceDist, WheelDist
+from pex.cli.commands.pip.core import LocalProject, SourceDist, WheelDist
 from pex.common import safe_copy, safe_mkdir
 from pex.resolver import BuildRequest
 from pex.result import Ok, Result, try_
@@ -41,30 +41,38 @@ def run(self):
         dists = try_(core.download_distributions(configuration))
 
         wheels = OrderedDict()  # type: OrderedDict[str, str]
+        local_projects = []  # type: List[LocalProject]
         sdists = []  # type: List[SourceDist]
         for dist in dists:
             if isinstance(dist, WheelDist):
                 wheels[os.path.basename(dist.path)] = dist.path
+            elif isinstance(dist, LocalProject):
+                local_projects.append(dist)
             else:
                 sdists.append(dist)
 
-        if sdists:
+        if local_projects or sdists:
+            build_requests = []  # type: List[BuildRequest]
+            for target in configuration.resolve_targets().unique_targets():
+                for local_project in local_projects:
+                    build_requests.append(
+                        BuildRequest.for_directory(
+                            target=target,
+                            source_path=local_project.path,
+                            editable=local_project.editable,
+                        )
+                    )
+                for sdist in sdists:
+                    build_requests.append(
+                        BuildRequest.for_file(
+                            target=target,
+                            source_path=sdist.path,
+                            subdirectory=sdist.subdirectory,
+                        )
+                    )
             wheels.update(
                 (os.path.basename(wheel), wheel)
-                for wheel in try_(
-                    core.build_wheels(
-                        configuration,
-                        tuple(
-                            BuildRequest.for_file(
-                                target=target,
-                                source_path=sdist.path,
-                                subdirectory=sdist.subdirectory,
-                            )
-                            for sdist in sdists
-                            for target in configuration.resolve_targets().unique_targets()
-                        ),
-                    )
-                )
+                for wheel in try_(core.build_wheels(configuration, build_requests))
             )
 
         safe_mkdir(self.options.dest_dir)
diff --git a/testing/local_project.py b/testing/local_project.py
@@ -0,0 +1,72 @@
+# Copyright 2026 Pex project contributors.
+# Licensed under the Apache License, Version 2.0 (see LICENSE).
+
+from __future__ import absolute_import, print_function
+
+import os
+from textwrap import dedent
+
+from pex.common import safe_open
+
+
+class LocalProject(str):
+    def edit_all_caps(self, all_caps):
+        # type: (bool) -> None
+        with open(os.path.join(self, "local_project.py"), "a") as fp:
+            print("ALL_CAPS={all_caps!r}".format(all_caps=all_caps), file=fp)
+
+
+def create(project_dir):
+    # type: (str) -> LocalProject
+    with safe_open(os.path.join(project_dir, "local_project.py"), "w") as fp:
+        fp.write(
+            dedent(
+                """\
+                from __future__ import print_function
+
+                import sys
+
+
+                ALL_CAPS = False
+
+
+                def main():
+                    text = sys.argv[1:]
+                    if ALL_CAPS:
+                        text[:] = [item.upper() for item in text]
+                    print(*text, end="")
+
+                """
+            )
+        )
+    with safe_open(os.path.join(project_dir, "setup.cfg"), "w") as fp:
+        fp.write(
+            dedent(
+                """\
+                [metadata]
+                name = local_project
+                version = 0.0.1
+
+                [options]
+                py_modules =
+                    local_project
+
+                [options.entry_points]
+                console_scripts =
+                    local-project = local_project:main
+                """
+            )
+        )
+    with safe_open(os.path.join(project_dir, "setup.py"), "w") as fp:
+        fp.write("from setuptools import setup; setup()")
+    with open(os.path.join(project_dir, "pyproject.toml"), "w") as fp:
+        fp.write(
+            dedent(
+                """\
+                [build-system]
+                requires = ["setuptools"]
+                build-backend = "setuptools.build_meta"
+                """
+            )
+        )
+    return LocalProject(project_dir)
diff --git a/tests/integration/cli/commands/test_wheel.py b/tests/integration/cli/commands/test_wheel.py
@@ -11,10 +11,14 @@
 
 import pytest
 
+from pex.dist_metadata import ProjectNameAndVersion
 from pex.interpreter import PythonInterpreter
 from pex.interpreter_constraints import COMPATIBLE_PYTHON_VERSIONS
 from pex.os import LINUX, MAC, WINDOWS
+from pex.pep_503 import ProjectName
+from pex.venv.virtualenv import InstallationChoice, Virtualenv
 from testing.cli import run_pex3
+from testing.local_project import create as create_local_project
 from testing.pytest_utils.tmp import Tempdir
 
 
@@ -221,3 +225,37 @@ def test_vcs_subdir_via_pex_lock(tmpdir):
         "wheel", "--pip-version", "latest-compatible", "--lock", lock, "-d", dest_dir
     ).assert_success()
     assert [EXPECTED_SDEV_LOGGING_UTILS_WHL] == os.listdir(dest_dir)
+
+
+@pytest.mark.skipif(
+    sys.version_info < (3, 7),
+    reason=(
+        "Modern setuptools (>= 64.0.0) with support for pep-660 build_editable is required, and "
+        "setuptools 64 requires at least Python 3.7."
+    ),
+)
+def test_wheel_editable(tmpdir):
+    # type: (Tempdir) -> None
+
+    local_project = create_local_project(tmpdir.join("project"))
+    dest_dir = tmpdir.join("dest")
+    run_pex3("wheel", "-e", local_project, "ansicolors==1.1.8", "-d", dest_dir).assert_success()
+
+    wheels_by_project_name = {
+        ProjectNameAndVersion.from_filename(whl).canonicalized_project_name: whl
+        for whl in os.listdir(dest_dir)
+    }
+    assert "ansicolors-1.1.8-py2.py3-none-any.whl" == wheels_by_project_name.pop(
+        ProjectName("ansicolors")
+    )
+    local_project_editable_whl = wheels_by_project_name.pop(ProjectName("local_project"))
+    assert not wheels_by_project_name
+
+    venv = Virtualenv.create(
+        tmpdir.join("venv"),
+        install_pip=InstallationChoice.YES,
+        other_installs=[os.path.join(dest_dir, local_project_editable_whl)],
+    )
+    assert b"foo" == subprocess.check_output(args=[venv.bin_path("local-project"), "foo"])
+    local_project.edit_all_caps(True)
+    assert b"FOO" == subprocess.check_output(args=[venv.bin_path("local-project"), "foo"])
diff --git a/tests/integration/test_venv_editables.py b/tests/integration/test_venv_editables.py
