refactor: move tools/private/zipapp to tools/zipapp

python/private/py_executable.bzl

@@ -227,7 +227,7 @@ accepting arbitrary Python versions.
         ),
         "_exe_zip_maker": lambda: attrb.Label(
             cfg = "exec",
-            default = "//tools/private/zipapp:exe_zip_maker",
+            default = "//tools/zipapp:exe_zip_maker",
         ),
         "_launcher": lambda: attrb.Label(
             cfg = "target",

python/private/zipapp/py_zipapp_rule.bzl

@@ -362,7 +362,7 @@ Whether the output should be an executable zip file.
     ),
     "_exe_zip_maker": attr.label(
         cfg = "exec",
-        default = "//tools/private/zipapp:exe_zip_maker",
+        default = "//tools/zipapp:exe_zip_maker",
     ),
     "_launcher": attr.label(
         cfg = "target",
@@ -378,15 +378,15 @@ Whether the output should be an executable zip file.
     ),
     "_zip_main_maker": attr.label(
         cfg = "exec",
-        default = "//tools/private/zipapp:zip_main_maker",
+        default = "//tools/zipapp:zip_main_maker",
     ),
     "_zip_shell_template": attr.label(
         default = ":zip_shell_template",
         allow_single_file = True,
     ),
     "_zipper": attr.label(
         cfg = "exec",
-        default = "//tools/private/zipapp:zipper",
+        default = "//tools/zipapp:zipper",
     ),
 } | ({
     "_windows_launcher_maker": attr.label(

tests/tools/zipapp/BUILD.bazel

@@ -5,19 +5,19 @@ pytest_test(
     name = "zipper_test",
     srcs = ["zipper_test.py"],
     target_compatible_with = SUPPORTS_BZLMOD,
-    deps = ["//tools/private/zipapp:zipper_lib"],
+    deps = ["//tools/zipapp:zipper_lib"],
 )
 
 pytest_test(
     name = "exe_zip_maker_test",
     srcs = ["exe_zip_maker_test.py"],
     target_compatible_with = SUPPORTS_BZLMOD,
-    deps = ["//tools/private/zipapp:exe_zip_maker_lib"],
+    deps = ["//tools/zipapp:exe_zip_maker_lib"],
 )
 
 pytest_test(
     name = "zip_main_maker_test",
     srcs = ["zip_main_maker_test.py"],
     target_compatible_with = SUPPORTS_BZLMOD,
-    deps = ["//tools/private/zipapp:zip_main_maker_lib"],
+    deps = ["//tools/zipapp:zip_main_maker_lib"],
 )

tests/tools/zipapp/exe_zip_maker_test.py

@@ -1,7 +1,7 @@
 import hashlib
 import stat
 
-from tools.private.zipapp import exe_zip_maker
+from tools.zipapp import exe_zip_maker
 
 
 def test_create_exe_zip(tmp_path):

tests/tools/zipapp/zip_main_maker_test.py

@@ -1,7 +1,7 @@
 import hashlib
 import os
 
-from tools.private.zipapp import zip_main_maker
+from tools.zipapp import zip_main_maker
 
 
 def test_creates_zip_main(tmp_path, monkeypatch):

tests/tools/zipapp/zipper_test.py

@@ -2,7 +2,7 @@
 import shutil
 import zipfile
 
-from tools.private.zipapp import zipper
+from tools.zipapp import zipper
 
 
 def symlink_target_path(p):

tools/BUILD.bazel

@@ -33,6 +33,7 @@ filegroup(
         "//tools/precompiler:distribution",
         "//tools/private:distribution",
         "//tools/publish:distribution",
+        "//tools/zipapp:distribution",
     ],
     visibility = ["//:__pkg__"],
 )

tools/private/BUILD.bazel

@@ -6,9 +6,7 @@ package(
 
 filegroup(
     name = "distribution",
-    srcs = glob(["**"]) + [
-        "//tools/private/zipapp:distribution",
-    ],
+    srcs = glob(["**"]),
 )
 
 bzl_library(

tools/private/README.md

@@ -0,0 +1,9 @@
+# Developer Tools (`//tools/private`)
+
+This directory contains development-only tools used for maintaining and
+developing `rules_python` itself (such as release management, dependency
+updating, review bots, and repository maintenance scripts).
+
+Supporting tools for rules (e.g. `launcher`, `precompiler`, `zipapp`,
+`publish`, `wheelmaker`) belong as their own top-level directories under
+`//tools/`.