cleanup

Author: rickeylev

python/private/py_executable.bzl

@@ -526,8 +526,6 @@ def _create_venv(ctx, output_prefix, imports, runtime_details, add_runfiles_root
     venvs_use_declare_symlink_enabled = (
         VenvsUseDeclareSymlinkFlag.get_value(ctx) == VenvsUseDeclareSymlinkFlag.YES
     )
-
-    # todo: default this to True for bootstrap=system_python ?
     recreate_venv_at_runtime = False
 
     if runtime.interpreter:
@@ -549,12 +547,7 @@ def _create_venv(ctx, output_prefix, imports, runtime_details, add_runfiles_root
         # File object to figure out some paths.
         interpreter = ctx.actions.declare_file("{}/{}".format(bin_dir, py_exe_basename))
 
-        # todo: system_python not handling this case
-        ##ctx.actions.write(interpreter, "actual:{}".format(interpreter_actual_path))
-        ctx.actions.write(
-            interpreter,
-            "#!/bin/sh\necho 'ERROR: tried to use build-time venv when it should recreate venv'; exit 1",
-        )
+        ctx.actions.write(interpreter, "actual:{}".format(interpreter_actual_path))
 
     elif runtime.interpreter:
         # Even though ctx.actions.symlink() is used, using

python/private/python_bootstrap_template.txt

@@ -280,7 +280,7 @@ print(site.getsitepackages(["{venv}"])[-1])
         output = output.strip().split("\n")
         python_exe_actual = output[0]
         venv_site_packages = output[1]
-        os.makedirs(dirname(venv_site_package), exist_ok=True)
+        os.makedirs(dirname(venv_site_packages), exist_ok=True)
         runfiles_venv_site_packages = join(runfiles_venv, VENV_REL_SITE_PACKAGES)
     else:
         python_exe_actual = FindBinary(runfiles_root, PYTHON_BINARY_ACTUAL)
@@ -362,7 +362,8 @@ def ExecuteFile(python_program, main_filename, args, env, runfiles_root,
     runfiles_root: (str) Path to the module space/runfiles tree directory
     workspace: (str|None) Name of the workspace to execute in. This is expected to be a
         directory under the runfiles tree.
-    delete_dirs: (list[str])
+    delete_dirs: (list[str]) directories that should be deleted after the user
+        program has finished running.
   """
   argv = [python_program]
   argv.extend(INTERPRETER_ARGS)

python/private/runtime_env_repo.bzl

@@ -5,36 +5,17 @@ load("//python/private:repo_utils.bzl", "repo_utils")
 def _runtime_env_repo_impl(rctx):
     pyenv = repo_utils.which_unchecked(rctx, "pyenv").binary
     if pyenv != None:
-        ##main_project_python_version_file = rctx.path(rctx.attr._main_python_version_file)
-        ##if main_project_python_version_file.exists:
-        ##    cwd = str(main_project_python_version_file.dirname)
-        ##    print("run pyenv in", cwd)
-        ##else:
-        ##    cwd = None
         pyenv_version_file = repo_utils.execute_checked(
             rctx,
             op = "GetPyenvVersionFile",
             arguments = [pyenv, "version-file"],
-            ##    working_directory = cwd,
         ).stdout.strip()
 
         # When pyenv is used, the version file is what decided the
         # version used. Watch it so we compute the correct value if the
         # user changes it.
         rctx.watch(pyenv_version_file)
-        print("watch:", pyenv_version_file)
-        origin = repo_utils.execute_checked(
-            rctx,
-            op = "GetPyenvVersionFile",
-            arguments = [pyenv, "version-origin"],
-            ##working_directory = cwd,
-        ).stdout.strip()
-        print("origin:", origin)
-        rctx.getenv("PYENV_VERSION")
 
-    which = rctx.which("python3")
-    print("py3 which:", which)
-    rctx.execute
     version = repo_utils.execute_checked(
         rctx,
         op = "GetPythonVersion",
@@ -52,13 +33,9 @@ def _runtime_env_repo_impl(rctx):
             "PYENV_VERSION": "",
         },
     ).stdout.strip()
-    print("Detected Python version:", version)
     rctx.file("info.bzl", "PYTHON_VERSION = '{}'\n".format(version))
     rctx.file("BUILD.bazel", "")
 
 runtime_env_repo = repository_rule(
     implementation = _runtime_env_repo_impl,
-    attrs = {
-        "_main_python_version_file": attr.label(default = "@//:.python-version"),
-    },
 )

tests/runtime_env_toolchain/BUILD.bazel

@@ -19,17 +19,12 @@ load(":runtime_env_toolchain_tests.bzl", "runtime_env_toolchain_test_suite")
 
 runtime_env_toolchain_test_suite(name = "runtime_env_toolchain_tests")
 
-print(PYTHON_VERSION)
-
 py_reconfig_test(
     name = "toolchain_runs_test",
     srcs = ["toolchain_runs_test.py"],
     data = [
         "//tests/support:current_build_settings",
     ],
-    env = {
-        "RULES_PYTHON_BOOTSTRAP_VERBOSE": "1",
-    },
     extra_toolchains = [
         "//python/runtime_env_toolchains:all",
         # Necessary for RBE CI