From bf41746b15139e6715138b8f8f98bf5498c7ec6a Mon Sep 17 00:00:00 2001 From: Fahrzin Hemmati Date: Tue, 22 Nov 2022 00:40:17 -0800 Subject: [PATCH] Two last vestiges of python_stub_template --- .../build/lib/bazel/rules/python/BazelPythonSemantics.java | 2 +- .../build/lib/starlarkbuildapi/python/PyRuntimeInfoApi.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java index 5e97852f7459ae..7a6c42a922023f 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java @@ -345,7 +345,7 @@ private static String getZipRunfilesPath( } // We put the whole runfiles tree under the ZIP_RUNFILES_DIRECTORY_NAME directory, by doing this // , we avoid the conflict between default workspace name "__main__" and __main__.py file. - // Note: This name has to be the same with the one in python_stub_template.txt. + // Note: This name has to be the same with the one in python_bootstrap_template.txt. return ZIP_RUNFILES_DIRECTORY_NAME.getRelative(zipRunfilesPath).toString(); } diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/PyRuntimeInfoApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/PyRuntimeInfoApi.java index 14fe7f09371606..16ba609dd8b30e 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/PyRuntimeInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/python/PyRuntimeInfoApi.java @@ -47,7 +47,7 @@ public interface PyRuntimeInfoApi extends StarlarkValue { static final String DEFAULT_STUB_SHEBANG = "#!/usr/bin/env python3"; - static final String DEFAULT_BOOTSTRAP_TEMPLATE = "//tools/python:python_stub_template.txt"; + static final String DEFAULT_BOOTSTRAP_TEMPLATE = "//tools/python:python_bootstrap_template.txt"; @StarlarkMethod( name = "interpreter_path", @@ -127,7 +127,7 @@ public interface PyRuntimeInfoApi extends StarlarkValue { doc = "The stub script template file to use. Should have %python_binary%, " + "%workspace_name%, %main%, and %imports%. See " - + "@bazel_tools//tools/python:python_stub_template.txt for more variables.") + + "@bazel_tools//tools/python:python_bootstrap_template.txt for more variables.") FileT getBootstrapTemplate(); /** Provider type for {@link PyRuntimeInfoApi} objects. */