cleanup

Author: rickeylev

python/private/stage1_bootstrap_template.sh

@@ -5,7 +5,6 @@ set -e
 if [[ -n "${RULES_PYTHON_BOOTSTRAP_VERBOSE:-}" ]]; then
   set -x
 fi
-##  set -x
 
 # runfiles-relative path
 STAGE2_BOOTSTRAP="%stage2_bootstrap%"
@@ -147,7 +146,6 @@ if [[ "$IS_ZIPFILE" == "1" ]]; then
   mkdir -p "$(dirname $python_exe)"
   ln -s "$symlink_to" "$python_exe"
 elif [[ "$RECREATE_VENV_AT_RUNTIME" == "1" ]]; then
-  runfiles_venv="$RUNFILES_DIR/$(dirname $(dirname $PYTHON_BINARY))"
 
   if [[ -n "$RULES_PYTHON_EXTRACT_ROOT" ]]; then
     use_exec=1
@@ -166,9 +164,9 @@ elif [[ "$RECREATE_VENV_AT_RUNTIME" == "1" ]]; then
   fi
 
   # Match the basename; some tools, e.g. pyvenv key off the executable name
-  venv_py_exe="$venv/bin/$(basename $PYTHON_BINARY_ACTUAL)"
+  python_exe="$venv/bin/$(basename $PYTHON_BINARY_ACTUAL)"
 
-  if [[ ! -e "$venv_py_exe" ]]; then
+  if [[ ! -e "$python_exe" ]]; then
     if [[ "$PYTHON_BINARY_ACTUAL" == /* ]]; then
       # An absolute path, i.e. platform runtime, e.g. /usr/bin/python3
       symlink_to=$PYTHON_BINARY_ACTUAL
@@ -185,6 +183,7 @@ elif [[ "$RECREATE_VENV_AT_RUNTIME" == "1" ]]; then
       fi
     fi
 
+    runfiles_venv="$RUNFILES_DIR/$(dirname $(dirname $PYTHON_BINARY))"
     # When RESOLVE_PYTHON_BINARY_AT_RUNTIME is true, it means the toolchain
     # has thrown two complications at us:
     # 1. The build-time assumption of the Python version may not match the
@@ -230,7 +229,6 @@ EOF
   if [[ ! -e "$venv/pyvenv.cfg" ]]; then
     ln -s "$runfiles_venv/pyvenv.cfg" "$venv/pyvenv.cfg"
   fi
-
 else
   use_exec=1
 fi

tests/runtime_env_toolchain/toolchain_runs_test.py

@@ -3,32 +3,15 @@
 import platform
 import unittest
 
+from python.runfiles import runfiles
 
 class RunTest(unittest.TestCase):
     def test_ran(self):
-        import os
-        ##os.system("which python3")
-        ##for x, y in sorted(os.environ.items()):
-        ##    print(f"{x}={y}")
-        import sys
-        print(f"{sys.executable=}")
-        print(f"{sys.prefix=}")
-        print(f"{sys.base_prefix=}")
-        for i, x in enumerate(sys.path):
-            print(i, x)
-
-        ##todo trying to get bazel to use py 3.9
-        ## Use pyenv global to change the version used when shell isn't
-        ## inherited
-        ##print(sys.base_executable)
-        print(sys.version)
-        from python.runfiles import runfiles
         rf = runfiles.Create()
         settings_path = rf.Rlocation(
             "rules_python/tests/support/current_build_settings.json"
         )
         settings = json.loads(pathlib.Path(settings_path).read_text())
-        print(settings)
         if platform.system() == "Windows":
             self.assertEqual(
                 "/_magic_pyruntime_sentinel_do_not_use", settings["interpreter_path"]