cleanup debug stuff

Author: rickeylev

python/private/py_executable_info.bzl

@@ -79,7 +79,17 @@ implementation isn't being used.
 :::
 """,
         "venv_app_symlinks": """
-todo
+:type: depset[ExplicitSymlink] | None
+
+Symlinks that are specific to the application within the venv (e.g.
+dependencies).
+
+Only used with Windows for files that would have used `declare_symlink()`
+to create relative symlinks. These may overlap with paths in runfiles; it's
+up to the consumer to determine how to handle such overlaps.
+
+:::{versionadded} VERSION_NEXT_FEATURE
+:::
 """,
         "venv_interpreter_runfiles": """
 :type: runfiles | None

python/private/python_bootstrap_template.txt

@@ -310,13 +310,13 @@ def create_runfiles_root():
   return join(temp_dir, 'runfiles')
 
 def _symlink_tree(link_from, link_to):
-    # Ensure the source is an absolute path for valid symlinking
+    # Ensure the source is an absolute path to simplify symlinking
     link_to_root = abspath(link_to)
     link_from_root = abspath(link_from)
 
     # This is non-optimal because it recreates the entire
     # venv site-packages tree (as opposed to finding a highest-common
-    # directory to symlink). But its easy and safe.
+    # directory to symlink). But its easy and understandable.
     for root, dirs, files in os.walk(link_to_root):
         rel_path = os.path.relpath(root, link_to_root)
         link_from_dir = join(link_from_root, rel_path)

python/private/zipapp/py_zipapp_rule.bzl

@@ -4,7 +4,16 @@ load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@rules_python_internal//:rules_python_config.bzl", rp_config = "config")
 load("//python/private:attributes.bzl", "apply_config_settings_attr")
 load("//python/private:builders.bzl", "builders")
-load("//python/private:common.bzl", "BUILTIN_BUILD_PYTHON_ZIP", "actions_run", "create_windows_exe_launcher", "is_windows_platform", "maybe_builtin_build_python_zip", "maybe_create_repo_mapping", "runfiles_root_path")
+load(
+    "//python/private:common.bzl",
+    "BUILTIN_BUILD_PYTHON_ZIP",
+    "actions_run",
+    "create_windows_exe_launcher",
+    "is_windows_platform",
+    "maybe_builtin_build_python_zip",
+    "maybe_create_repo_mapping",
+    "runfiles_root_path",
+)
 load("//python/private:common_labels.bzl", "labels")
 load("//python/private:py_executable_info.bzl", "PyExecutableInfo")
 load("//python/private:py_internal.bzl", "py_internal")

python/private/zipapp/zip_main_template.py

@@ -194,7 +194,6 @@ def extract_zip(zip_path, dest_dir):
                 with open(file_path, "r") as f:
                     target = f.read()
                 os.remove(file_path)
-                print_verbose("link", file_path, "to", target)
                 if IS_WINDOWS:
                     entry_path = normpath(join(dirname(info.filename), target))
                     # Zip lookup uses forward slashes, target has backslashes.
@@ -227,7 +226,7 @@ def create_runfiles_root():
             extract_root = get_windows_path_with_unc_prefix(extract_root)
     else:
         extract_root = tempfile.mkdtemp("", "Bazel.runfiles_")
-    shutil.rmtree(extract_root, True)
+
     extract_zip(dirname(__file__), extract_root)
     print_verbose("extracted to:", extract_root)
     # IMPORTANT: Later code does `rm -fr` on dirname(runfiles_root) -- it's
@@ -368,7 +367,6 @@ def main():
     if _PYTHON_BINARY_VENV:
         python_program = finish_venv_setup(runfiles_root)
     else:
-        assert False, "should be using venv"
         python_program = find_binary(runfiles_root, _PYTHON_BINARY_ACTUAL)
         if python_program is None:
             raise AssertionError(