From abac941a430a1b27e8b473b0419946e317b2eafb Mon Sep 17 00:00:00 2001
From: Tom Solberg <me@sbg.dev>
Date: Tue, 11 Feb 2025 22:47:07 +0100
Subject: [PATCH] explicitly resolve Python for pex run/package

---
 .../backend/python/goals/package_pex_binary.py  | 17 +++++++++++++++--
 .../backend/python/goals/run_pex_binary.py      | 15 +++++++--------
 .../python/util_rules/pex_from_targets.py       |  7 +++++--
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/python/pants/backend/python/goals/package_pex_binary.py b/src/python/pants/backend/python/goals/package_pex_binary.py
index a75754278dc..72a14ea81a7 100644
--- a/src/python/pants/backend/python/goals/package_pex_binary.py
+++ b/src/python/pants/backend/python/goals/package_pex_binary.py
@@ -34,7 +34,11 @@
     ResolvePexEntryPointRequest,
 )
 from pants.backend.python.util_rules.pex import CompletePlatforms, Pex
-from pants.backend.python.util_rules.pex_from_targets import PexFromTargetsRequest
+from pants.backend.python.util_rules.pex_environment import PythonExecutable
+from pants.backend.python.util_rules.pex_from_targets import (
+    InterpreterConstraintsRequest,
+    PexFromTargetsRequest,
+)
 from pants.core.goals.package import (
     BuiltPackage,
     BuiltPackageArtifact,
@@ -143,6 +147,12 @@ async def package_pex_binary(
     complete_platforms = await Get(
         CompletePlatforms, PexCompletePlatformsField, field_set.complete_platforms
     )
+    python = await Get(
+        PythonExecutable,
+        InterpreterConstraintsRequest(
+            addresses=[field_set.address],
+        ),
+    )
 
     request = PexFromTargetsRequest(
         addresses=[field_set.address],
@@ -158,6 +168,7 @@ async def package_pex_binary(
         include_source_files=field_set.include_sources.value,
         include_local_dists=True,
         warn_for_transitive_files_targets=True,
+        python=python,
     )
 
     return PexFromTargetsRequestForBuiltPackage(request)
@@ -169,7 +180,9 @@ async def built_pacakge_for_pex_from_targets_request(
 ) -> BuiltPackage:
     pft_request = request.request
     pex = await Get(Pex, PexFromTargetsRequest, pft_request)
-    return BuiltPackage(pex.digest, (BuiltPackageArtifact(pft_request.output_filename),))
+    return BuiltPackage(
+        pex.digest, (BuiltPackageArtifact(pft_request.output_filename),)
+    )
 
 
 def rules():
diff --git a/src/python/pants/backend/python/goals/run_pex_binary.py b/src/python/pants/backend/python/goals/run_pex_binary.py
index 4fd08c59844..5c5dd1a2b09 100644
--- a/src/python/pants/backend/python/goals/run_pex_binary.py
+++ b/src/python/pants/backend/python/goals/run_pex_binary.py
@@ -18,15 +18,14 @@
 
 @rule(level=LogLevel.DEBUG)
 async def create_pex_binary_run_request(field_set: PexBinaryFieldSet) -> RunRequest:
-    pex_request = await Get(PexFromTargetsRequestForBuiltPackage, PexBinaryFieldSet, field_set)
-    built_pex = await Get(BuiltPackage, PexFromTargetsRequestForBuiltPackage, pex_request)
-
+    pex_request = await Get(
+        PexFromTargetsRequestForBuiltPackage, PexBinaryFieldSet, field_set
+    )
     # We need a Python executable to fulfil `adhoc_tool`/`runnable_dependency` requests
     # as sandboxed processes will not have a `python` available on the `PATH`.
-    python = await Get(
-        PythonExecutable,
-        InterpreterConstraintsRequest,
-        pex_request.request.to_interpreter_constraints_request(),
+
+    built_pex = await Get(
+        BuiltPackage, PexFromTargetsRequestForBuiltPackage, pex_request
     )
 
     relpath = built_pex.artifacts[0].relpath
@@ -36,7 +35,7 @@ async def create_pex_binary_run_request(field_set: PexBinaryFieldSet) -> RunRequ
 
     return RunRequest(
         digest=built_pex.digest,
-        args=[python.path, os.path.join("{chroot}", relpath)],
+        args=[pex_request.request.python.path, os.path.join("{chroot}", relpath)],
     )
 
 
diff --git a/src/python/pants/backend/python/util_rules/pex_from_targets.py b/src/python/pants/backend/python/util_rules/pex_from_targets.py
index 3eb040a230b..930ad5e0885 100644
--- a/src/python/pants/backend/python/util_rules/pex_from_targets.py
+++ b/src/python/pants/backend/python/util_rules/pex_from_targets.py
@@ -93,6 +93,7 @@ class PexFromTargetsRequest:
     # This field doesn't participate in comparison (and therefore hashing), as it doesn't affect
     # the result.
     description: str | None = dataclasses.field(compare=False)
+    python: PythonExecutable | None
 
     def __init__(
         self,
@@ -116,6 +117,7 @@ def __init__(
         hardcoded_interpreter_constraints: InterpreterConstraints | None = None,
         description: str | None = None,
         warn_for_transitive_files_targets: bool = False,
+        python: PythonExecutable | None = None,
     ) -> None:
         """Request to create a Pex from the transitive closure of the given addresses.
 
@@ -179,7 +181,7 @@ def __init__(
         object.__setattr__(
             self, "warn_for_transitive_files_targets", warn_for_transitive_files_targets
         )
-
+        object.__setattr__(self, "python", python)
         self.__post_init__()
 
     def __post_init__(self):
@@ -606,7 +608,7 @@ async def create_pex_from_targets(
         internal_only=request.internal_only,
         layout=request.layout,
         requirements=requirements,
-        interpreter_constraints=interpreter_constraints,
+        #        interpreter_constraints=interpreter_constraints,
         platforms=request.platforms,
         complete_platforms=request.complete_platforms,
         main=request.main,
@@ -617,6 +619,7 @@ async def create_pex_from_targets(
         additional_args=additional_args,
         description=description,
         pex_path=additional_pexes,
+        python=request.python,
     )