Merge f9ac86c into 7f76dbc

src/python/pants/backend/python/goals/pytest_runner.py

@@ -6,7 +6,6 @@
 from dataclasses import dataclass
 from pathlib import PurePath
 from typing import Optional, cast
-from uuid import UUID
 
 from pants.backend.python.goals.coverage_py import (
     CoverageConfig,
@@ -42,7 +41,7 @@
 from pants.core.util_rules.source_files import SourceFiles, SourceFilesRequest
 from pants.engine.addresses import Addresses
 from pants.engine.fs import AddPrefix, Digest, DigestSubset, MergeDigests, PathGlobs, Snapshot
-from pants.engine.internals.uuid import UUIDRequest
+from pants.engine.internals.uuid import UUID, UUIDRequest
 from pants.engine.process import FallibleProcessResult, InteractiveProcess, Process
 from pants.engine.rules import Get, MultiGet, collect_rules, rule
 from pants.engine.target import FieldSetsPerTarget, FieldSetsPerTargetRequest, TransitiveTargets

src/python/pants/engine/internals/uuid.py

@@ -4,6 +4,7 @@
 import random
 import uuid
 from dataclasses import dataclass, field
+from uuid import UUID as UUID
 
 from pants.engine.rules import _uncacheable_rule, collect_rules
 
@@ -14,7 +15,7 @@ class UUIDRequest:
 
 
 @_uncacheable_rule
-async def generate_uuid(_: UUIDRequest) -> uuid.UUID:
+async def generate_uuid(_: UUIDRequest) -> UUID:
     """A rule to generate a UUID.
 
     Useful primarily to force a rule to re-run: a rule that `await Get`s on a UUIDRequest will be

src/python/pants/engine/internals/uuid_test.py

@@ -1,11 +1,9 @@
 # Copyright 2020 Pants project contributors (see CONTRIBUTORS.md).
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-from uuid import UUID
-
 import pytest
 
-from pants.engine.internals.uuid import UUIDRequest
+from pants.engine.internals.uuid import UUID, UUIDRequest
 from pants.engine.internals.uuid import rules as uuid_rules
 from pants.engine.rules import QueryRule
 from pants.testutil.rule_runner import RuleRunner

src/python/pants/engine/process.py

@@ -10,8 +10,9 @@
 from pants.base.exception_sink import ExceptionSink
 from pants.engine.engine_aware import EngineAwareReturnType
 from pants.engine.fs import EMPTY_DIGEST, CreateDigest, Digest, FileContent
+from pants.engine.internals.uuid import UUID, UUIDRequest
 from pants.engine.platform import Platform, PlatformConstraint
-from pants.engine.rules import Get, collect_rules, rule, side_effecting
+from pants.engine.rules import Get, MultiGet, collect_rules, rule, side_effecting
 from pants.util.frozendict import FrozenDict
 from pants.util.logging import LogLevel
 from pants.util.meta import frozen_after_init
@@ -367,9 +368,15 @@ async def find_binary(request: BinaryPathRequest) -> BinaryPaths:
         fi
         """
     )
-    script_digest = await Get(
-        Digest,
-        CreateDigest([FileContent(script_path, script_content.encode(), is_executable=True)]),
+
+    # We get a UUID so that we ignore the cache every time, as this script depends on the state of
+    # the external environment.
+    script_digest, uuid = await MultiGet(
+        Get(
+            Digest,
+            CreateDigest([FileContent(script_path, script_content.encode(), is_executable=True)]),
+        ),
+        Get(UUID, UUIDRequest()),
     )
 
     paths = []
@@ -381,7 +388,7 @@ async def find_binary(request: BinaryPathRequest) -> BinaryPaths:
             level=LogLevel.DEBUG,
             input_digest=script_digest,
             argv=[script_path, request.binary_name],
-            env={"PATH": search_path},
+            env={"PATH": search_path, "__PANTS_UUID__": str(uuid)},
         ),
     )
     if result.exit_code == 0: