get remote execution working

Author: philsc

python/private/interpreter.bzl

@@ -31,15 +31,24 @@ def _interpreter_impl(ctx):
     # re-exec. If it's not a recognized name, then they fail.
     if runtime.interpreter:
         executable = ctx.actions.declare_file(runtime.interpreter.basename)
-        ctx.actions.symlink(output = executable, target_file = runtime.interpreter, is_executable = True)
+        ctx.actions.expand_template(
+            template = ctx.file._template,
+            output = executable,
+            substitutions = {
+                "%target_file%": runtime.interpreter.short_path,
+            },
+            is_executable = True,
+        )
     else:
         executable = ctx.actions.declare_symlink(paths.basename(runtime.interpreter_path))
         ctx.actions.symlink(output = executable, target_path = runtime.interpreter_path)
 
     return [
         DefaultInfo(
             executable = executable,
-            runfiles = ctx.runfiles([executable], transitive_files = runtime.files),
+            runfiles = ctx.runfiles([executable], transitive_files = runtime.files).merge_all([
+                ctx.attr._bash_runfiles[DefaultInfo].default_runfiles,
+            ]),
         ),
     ]
 
@@ -51,5 +60,12 @@ interpreter = rule(
         "binary": attr.label(
             mandatory = True,
         ),
+        "_template": attr.label(
+            default = "//python/private:interpreter_tmpl.sh",
+            allow_single_file = True,
+        ),
+        "_bash_runfiles": attr.label(
+            default = "@bazel_tools//tools/bash/runfiles",
+        ),
     },
 )

python/private/interpreter_tmpl.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# --- begin runfiles.bash initialization v3 ---
+# Copy-pasted from the Bazel Bash runfiles library v3.
+set -uo pipefail; set +e; f=bazel_tools/tools/bash/runfiles/runfiles.bash
+# shellcheck disable=SC1090
+source "${RUNFILES_DIR:-/dev/null}/$f" 2>/dev/null || \
+  source "$(grep -sm1 "^$f " "${RUNFILES_MANIFEST_FILE:-/dev/null}" | cut -f2- -d' ')" 2>/dev/null || \
+  source "$0.runfiles/$f" 2>/dev/null || \
+  source "$(grep -sm1 "^$f " "$0.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
+  source "$(grep -sm1 "^$f " "$0.exe.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
+  { echo>&2 "ERROR: cannot find $f"; exit 1; }; f=; set -e
+# --- end runfiles.bash initialization v3 ---
+
+readonly TARGET_FILE="%target_file%"
+
+MAIN_BIN="$(rlocation "${TARGET_FILE#*/}")"
+
+exec "${MAIN_BIN}" "$@"

tests/interpreter/interpreter_test.py

@@ -32,31 +32,43 @@ def test_interpreter_version(self):
         """Validates that we can successfully execute arbitrary code from the CLI."""
         expected_version = os.environ["EXPECTED_INTERPRETER_VERSION"]
 
-        result = subprocess.check_output(
-            [self.interpreter],
-            text=True,
-            input="\r".join(
-                [
-                    "import sys",
-                    "v = sys.version_info",
-                    "print(f'version: {v.major}.{v.minor}')",
-                ]
-            ),
-        ).strip()
+        try:
+            result = subprocess.check_output(
+                [self.interpreter],
+                text=True,
+                stderr=subprocess.STDOUT,
+                input="\r".join(
+                    [
+                        "import sys",
+                        "v = sys.version_info",
+                        "print(f'version: {v.major}.{v.minor}')",
+                    ]
+                ),
+            ).strip()
+        except subprocess.CalledProcessError as error:
+            print("OUTPUT:", error.stdout)
+            raise
+
         self.assertEqual(result, f"version: {expected_version}")
 
     def test_json_tool(self):
         """Validates that we can successfully invoke a module from the CLI."""
         # Pass unformatted JSON to the json.tool module.
-        result = subprocess.check_output(
-            [
-                self.interpreter,
-                "-m",
-                "json.tool",
-            ],
-            text=True,
-            input='{"json":"obj"}',
-        ).strip()
+        try:
+            result = subprocess.check_output(
+                [
+                    self.interpreter,
+                    "-m",
+                    "json.tool",
+                ],
+                text=True,
+                stderr=subprocess.STDOUT,
+                input='{"json":"obj"}',
+            ).strip()
+        except subprocess.CalledProcessError as error:
+            print("OUTPUT:", error.stdout)
+            raise
+
         # Validate that we get formatted JSON back.
         self.assertEqual(result, '{\n    "json": "obj"\n}')