python: Fixed bootstrap template not being passed to py_binary from p…

…y_runtime on bazel latest This PR fixes a small bug where the bootstrap template runtime file was not being passed to Py Binary. This broke the bootstrap template feature on bazel latest authored in bazelbuild#16806 Closes bazelbuild#18103. PiperOrigin-RevId: 525042380 Change-Id: I8b8a200634eb98e156b4d8ba6b2e5baef5d06c73
fweikert · May 25, 2023 · b726aa6 · b726aa6
1 parent 0d600cf
commit b726aa6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/starlark/builtins_bzl/common/python/py_executable_bazel.bzl b/src/main/starlark/builtins_bzl/common/python/py_executable_bazel.bzl
@@ -290,11 +290,13 @@ def _expand_bootstrap_template(
 
     if runtime:
         shebang = runtime.stub_shebang
+        template = runtime.bootstrap_template
     else:
         shebang = DEFAULT_STUB_SHEBANG
+        template = ctx.file._bootstrap_template
 
     ctx.actions.expand_template(
-        template = ctx.file._bootstrap_template,
+        template = template,
         output = output,
         substitutions = {
             "%shebang%": shebang,

diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/PythonStarlarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/python/PythonStarlarkApiTest.java
@@ -120,14 +120,16 @@ public void runtimeSandwich() throws Exception {
         "    return [PyRuntimeInfo(",
         "        interpreter = ctx.file.interpreter,",
         "        files = depset(direct = ctx.files.files, transitive=[info.files]),",
-        "        python_version = info.python_version)]",
+        "        python_version = info.python_version,",
+        "        bootstrap_template = ctx.file.bootstrap_template)]",
         "",
         "userruntime = rule(",
         "    implementation = _userruntime_impl,",
         "    attrs = {",
         "        'runtime': attr.label(),",
         "        'interpreter': attr.label(allow_single_file=True),",
         "        'files': attr.label_list(allow_files=True),",
+        "        'bootstrap_template': attr.label(allow_single_file=True),",
         "    },",
         ")");
     scratch.file(
@@ -148,6 +150,7 @@ public void runtimeSandwich() throws Exception {
         "    runtime = ':pyruntime',",
         "    interpreter = ':userintr',",
         "    files = ['userdata.txt'],",
+        "    bootstrap_template = 'bootstrap.txt',",
         ")",
         "py_runtime_pair(",
         "    name = 'userruntime_pair',",