Merge branch 'venv.bin.runnable' of https://github.com/rickeylev/rules_python into venv.bin.runnable

Author: rickeylev

python/private/pypi/whl_extract.bzl

@@ -65,6 +65,7 @@ def whl_extract(rctx, *, whl_path, logger):
         # Ensure that there is no data dir left
         rctx.delete(data_dir)
 
+# TODO: This can be removed when Bazel 8.6+ is the minimum supported version.
 def _maybe_fix_permissions(rctx, *, whl_path, logger):
     # Fix permissions on extracted files. Some wheels have files without read permissions set,
     # which causes errors when trying to read them later.

python/private/pypi/whl_library_targets.bzl

@@ -203,10 +203,14 @@ def whl_library_targets(
         bins_for_data_label.append(ep_target_name)
         data.append(ep_target_name)
 
-    # NOTE: We assume there is no overlap between the rewrite-bin file names,
-    # bin/ source files and generated bin/ files.
+    existing_bin_names = {ep["name"].lower(): None for ep in entry_points.values()}
+    for p in native.glob(["bin/*"], allow_empty = True):
+        existing_bin_names[p[len("bin/"):].lower()] = None
+
     for src_path in native.glob(["rewrite-bin/*"], allow_empty = True):
         script_name = src_path[len("rewrite-bin/"):]
+        if script_name.lower() in existing_bin_names:
+            continue
         rewrite_target_name = "bin/{}".format(script_name)
         rules.venv_rewrite_shebang(
             name = rewrite_target_name,

python/private/python_bootstrap_template.txt

@@ -524,7 +524,7 @@ def execute_file(python_program, main_filename, args, env, runfiles_root,
   if delete_dirs:
     for delete_dir in delete_dirs:
       print_verbose("cleanup: rmtree:", delete_dir)
-      ##shutil.rmtree(delete_dir, True)
+      shutil.rmtree(delete_dir, True)
   sys.exit(ret_code)
 
 def _run_execv(python_program, argv, env):

tests/pypi/whl_library_targets/whl_library_targets_tests.bzl

@@ -30,7 +30,7 @@ def _test_filegroups(env):
     def glob(include, *, exclude = [], allow_empty):
         _ = exclude  # @unused
         env.expect.that_bool(allow_empty).equals(True)
-        if include == ["rewrite-bin/*"]:
+        if include == ["rewrite-bin/*"] or include == ["bin/*"]:
             return []
         return include
 
@@ -175,6 +175,7 @@ def _test_whl_and_library_deps_from_requires(env):
 
     m_glob = mocks.glob()
 
+    m_glob.results.append([])  # bin
     m_glob.results.append([])  # rewrite-bin
     m_glob.results.append(["site-packages/foo/SRCS.py"])  # srcs
     m_glob.results.append(["site-packages/foo/DATA.txt"])  # data
@@ -248,6 +249,11 @@ def _test_whl_and_library_deps_from_requires(env):
     })  # buildifier: @unsorted-dict-items
 
     env.expect.that_collection(m_glob.calls).contains_exactly([
+        # bin call
+        mocks.glob_call(
+            ["bin/*"],
+            allow_empty = True,
+        ),
         # rewrite-bin call
         mocks.glob_call(
             ["rewrite-bin/*"],
@@ -288,6 +294,7 @@ def _test_whl_and_library_deps(env):
     filegroup_calls = []
     py_library_calls = []
     m_glob = mocks.glob()
+    m_glob.results.append([])  # bin
     m_glob.results.append([])  # rewrite-bin
     m_glob.results.append(["site-packages/foo/SRCS.py"])
     m_glob.results.append(["site-packages/foo/DATA.txt"])
@@ -388,6 +395,7 @@ def _test_group(env):
     py_library_calls = []
 
     m_glob = mocks.glob()
+    m_glob.results.append([])  # bin
     m_glob.results.append([])  # rewrite-bin
     m_glob.results.append(["site-packages/foo/srcs.py"])
     m_glob.results.append(["site-packages/foo/data.txt"])
@@ -456,6 +464,7 @@ def _test_group(env):
     })  # buildifier: @unsorted-dict-items
 
     env.expect.that_collection(m_glob.calls, expr = "glob calls").contains_exactly([
+        mocks.glob_call(["bin/*"], allow_empty = True),
         mocks.glob_call(["rewrite-bin/*"], allow_empty = True),
         mocks.glob_call(["site-packages/**/*.py"], exclude = [], allow_empty = True),
         mocks.glob_call(["site-packages/**/*"], exclude = [