fix: add runfiles root for system_python bootstrap

Author: rickeylev

python/private/py_executable.bzl

@@ -341,6 +341,9 @@ def _create_executable(
             output_prefix = base_executable_name,
             imports = imports,
             runtime_details = runtime_details,
+            add_runfiles_root_to_sys_path = (
+                "1" if BootstrapImplFlag.get_value(ctx) == BootstrapImplFlag.SYSTEM_PYTHON else "0"
+            ),
         )
 
         stage2_bootstrap = _create_stage2_bootstrap(
@@ -504,7 +507,7 @@ def _create_zip_main(ctx, *, stage2_bootstrap, runtime_details, venv):
 # * https://snarky.ca/how-virtual-environments-work/
 # * https://github.com/python/cpython/blob/main/Modules/getpath.py
 # * https://github.com/python/cpython/blob/main/Lib/site.py
-def _create_venv(ctx, output_prefix, imports, runtime_details):
+def _create_venv(ctx, output_prefix, imports, runtime_details, add_runfiles_root_to_sys_path):
     create_full_venv = BootstrapImplFlag.get_value(ctx) == BootstrapImplFlag.SCRIPT
     venv = "_{}.venv".format(output_prefix.lstrip("_"))
 
@@ -592,6 +595,7 @@ def _create_venv(ctx, output_prefix, imports, runtime_details):
         template = runtime.site_init_template,
         output = site_init,
         substitutions = {
+            "%add_runfiles_root_to_sys_path%": add_runfiles_root_to_sys_path,
             "%coverage_tool%": _get_coverage_tool_runfiles_path(ctx, runtime),
             "%import_all%": "True" if read_possibly_native_flag(ctx, "python_import_all_repositories") else "False",
             "%site_init_runfiles_path%": "{}/{}".format(ctx.workspace_name, site_init.short_path),

python/private/site_init_template.py

@@ -26,6 +26,8 @@
 _SELF_RUNFILES_RELATIVE_PATH = "%site_init_runfiles_path%"
 # Runfiles-relative path to the coverage tool entry point, if any.
 _COVERAGE_TOOL = "%coverage_tool%"
+# True if the runfiles root should be added to sys.path
+_ADD_RUNFILES_ROOT_TO_SYS_PATH = "%add_runfiles_root_to_sys_path%" == "1"
 
 
 def _is_verbose():
@@ -147,6 +149,9 @@ def _maybe_add_path(path):
         sys.path.append(path)
         seen.add(path)
 
+    if _ADD_RUNFILES_ROOT_TO_SYS_PATH:
+        _maybe_add_path(_RUNFILES_ROOT)
+
     for rel_path in _IMPORTS_STR.split(":"):
         abs_path = os.path.join(_RUNFILES_ROOT, rel_path)
         _maybe_add_path(abs_path)

tests/bootstrap_impls/BUILD.bazel

@@ -104,6 +104,18 @@ sh_py_run_test(
     target_compatible_with = SUPPORTS_BOOTSTRAP_SCRIPT,
 )
 
+py_reconfig_test(
+    name = "bazel_tools_importable_system_python_test",
+    srcs = ["bazel_tools_importable_test.py"],
+    bootstrap_impl = "system_python",
+    # Necessary because bazel_tools doesn't have __init__.py files.
+    legacy_create_init = True,
+    main = "bazel_tools_importable_test.py",
+    deps = [
+        "@bazel_tools//tools/python/runfiles",
+    ],
+)
+
 py_reconfig_test(
     name = "sys_path_order_bootstrap_script_test",
     srcs = ["sys_path_order_test.py"],
@@ -121,6 +133,9 @@ py_reconfig_test(
     env = {"BOOTSTRAP": "system_python"},
     imports = ["./site-packages"],
     main = "sys_path_order_test.py",
+    deps = [
+        "@bazel_tools//tools/python/runfiles",
+    ],
 )
 
 py_reconfig_test(

tests/bootstrap_impls/bazel_tools_importable_test.py

@@ -0,0 +1,20 @@
+import sys
+import unittest
+
+
+class SysPathOrderTest(unittest.TestCase):
+    def test_bazel_tools_importable(self):
+        try:
+            import bazel_tools
+            import bazel_tools.tools.python
+            import bazel_tools.tools.python.runfiles
+        except ImportError as exc:
+            raise AssertionError(
+                "Failed to import bazel_tools.python.runfiles\n"
+                + "sys.path:\n"
+                + "\n".join(f"{i}: {v}" for i, v in enumerate(sys.path))
+            ) from exc
+
+
+if __name__ == "__main__":
+    unittest.main()