WIP: make local_dists internal only

pantsbuild · Apr 2, 2024 · 8766e93 · 8766e93
1 parent c13d60a
commit 8766e93
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 9 deletions.
diff --git a/src/python/pants/backend/python/goals/pytest_runner.py b/src/python/pants/backend/python/goals/pytest_runner.py
@@ -311,7 +311,6 @@ async def setup_pytest_for_target(
         LocalDistsPex,
         LocalDistsPexRequest(
             addresses,
-            internal_only=True,
             interpreter_constraints=interpreter_constraints,
             sources=prepared_sources,
         ),

diff --git a/src/python/pants/backend/python/goals/repl.py b/src/python/pants/backend/python/goals/repl.py
@@ -90,7 +90,6 @@ async def create_python_repl_request(
         LocalDistsPex,
         LocalDistsPexRequest(
             request.addresses,
-            internal_only=True,
             interpreter_constraints=interpreter_constraints,
         ),
     )
@@ -156,7 +155,6 @@ async def create_ipython_repl_request(
         LocalDistsPex,
         LocalDistsPexRequest(
             request.addresses,
-            internal_only=True,
             interpreter_constraints=interpreter_constraints,
             sources=sources,
         ),

diff --git a/src/python/pants/backend/python/util_rules/local_dists.py b/src/python/pants/backend/python/util_rules/local_dists.py
@@ -106,7 +106,6 @@ class LocalDistsPexRequest:
     """Request to build the local dists from the dependency closure of a set of addresses."""
 
     addresses: Addresses
-    internal_only: bool
     interpreter_constraints: InterpreterConstraints
     # The result will return these with the sources provided by the dists subtracted out.
     # This will help the caller prevent sources from appearing twice on sys.path.
@@ -116,12 +115,10 @@ def __init__(
         self,
         addresses: Iterable[Address],
         *,
-        internal_only: bool,
         interpreter_constraints: InterpreterConstraints,
         sources: PythonSourceFiles = PythonSourceFiles.empty(),
     ) -> None:
         object.__setattr__(self, "addresses", Addresses(addresses))
-        object.__setattr__(self, "internal_only", internal_only)
         object.__setattr__(self, "interpreter_constraints", interpreter_constraints)
         object.__setattr__(self, "sources", sources)
 
@@ -185,7 +182,9 @@ async def build_local_dists(
             requirements=PexRequirements(wheels),
             interpreter_constraints=request.interpreter_constraints,
             additional_inputs=wheels_digest,
-            internal_only=request.internal_only,
+            # a "local dists" PEX is always just for consumption by some downstream Pants process,
+            # i.e. internal
+            internal_only=True,
             additional_args=["--intransitive"],
         ),
     )

diff --git a/src/python/pants/backend/python/util_rules/local_dists_test.py b/src/python/pants/backend/python/util_rules/local_dists_test.py
@@ -90,7 +90,6 @@ def test_build_local_dists(rule_runner: PythonRuleRunner) -> None:
     )
     request = LocalDistsPexRequest(
         addresses,
-        internal_only=True,
         sources=sources,
         interpreter_constraints=interpreter_constraints,
     )

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
@@ -566,7 +566,6 @@ async def create_pex_from_targets(
             LocalDistsPex,
             LocalDistsPexRequest(
                 request.addresses,
-                internal_only=request.internal_only,
                 interpreter_constraints=interpreter_constraints,
                 sources=sources,
             ),