move all of the alias setting to the new macro

Author: aignas

python/private/toolchain_aliases.bzl

@@ -16,13 +16,14 @@
 
 load("@rules_python//python:versions.bzl", "PLATFORMS")
 
-def toolchain_aliases(*, name, platforms, native = native):
+def toolchain_aliases(*, name, platforms, visibility = None, native = native):
     """Cretae toolchain aliases for the python toolchains.
 
     Args:
         name: {type}`str` The name of the current repository.
         platforms: {type}`platforms` The list of platforms that are supported
             for the current toolchain repository.
+        visibility: {type}`list[Target] | None` The visibility of the aliases.
         native: The native struct used in the macro, useful for testing.
     """
     for platform in PLATFORMS.keys():
@@ -36,10 +37,38 @@ def toolchain_aliases(*, name, platforms, native = native):
             visibility = ["//visibility:private"],
         )
 
-    native.alias(name = "files", actual = select({{":" + item: "@" + name + "_" + item + "//:files" for item in platforms}}))
-    native.alias(name = "includes", actual = select({{":" + item: "@" + name + "_" + item + "//:includes" for item in platforms}}))
-    native.alias(name = "libpython", actual = select({{":" + item: "@" + name + "_" + item + "//:libpython" for item in platforms}}))
-    native.alias(name = "py3_runtime", actual = select({{":" + item: "@" + name + "_" + item + "//:py3_runtime" for item in platforms}}))
-    native.alias(name = "python_headers", actual = select({{":" + item: "@" + name + "_" + item + "//:python_headers" for item in platforms}}))
-    native.alias(name = "python_runtimes", actual = select({{":" + item: "@" + name + "_" + item + "//:python_runtimes" for item in platforms}}))
-    native.alias(name = "python3", actual = select({{":" + item: "@" + name + "_" + item + "//:" + ("python.exe" if "windows" in item else "bin/python3") for item in platforms}}))
+    prefix = name
+    for name in [
+        "files",
+        "includes",
+        "libpython",
+        "py3_runtime",
+        "python_headers",
+        "python_runtimes",
+    ]:
+        native.alias(
+            name = name,
+            actual = select({
+                ":" + platform: "@{}_{}//:{}".format(prefix, platform, name)
+                for platform in platforms
+            }),
+            visibility = visibility,
+        )
+
+    native.alias(
+        name = "python3",
+        actual = select({
+            ":" + platform: "@{}_{}//:{}".format(prefix, platform, "python.exe" if "windows" in platform else "bin/python3")
+            for platform in platforms
+        }),
+        visibility = visibility,
+    )
+    native.alias(
+        name = "pip",
+        actual = select({
+            ":" + platform: "@{}_{}//:python_runtimes".format(prefix, platform)
+            for platform in platforms
+            if "windows" not in platform
+        }),
+        visibility = visibility,
+    )

python/private/toolchains_repo.bzl

@@ -126,16 +126,13 @@ toolchains_repo = repository_rule(
 )
 
 def _toolchain_aliases_impl(rctx):
-    logger = repo_utils.logger(rctx)
-    (os_name, _) = _get_host_os_arch(rctx, logger)
-
-    is_windows = (os_name == WINDOWS_NAME)
-
     # Base BUILD file for this repository.
     build_contents = """\
 # Generated by python/private/toolchains_repo.bzl
-package(default_visibility = ["//visibility:public"])
 load("@rules_python//python/private:toolchain_aliases.bzl", "toolchain_aliases")
+
+package(default_visibility = ["//visibility:public"])
+
 exports_files(["defs.bzl"])
 
 PLATFORMS = [
@@ -149,12 +146,6 @@ toolchain_aliases(
         py_repository = rctx.attr.user_repository_name,
         loaded_platforms = "\n".join(["    \"{}\",".format(p) for p in rctx.attr.platforms]),
     )
-    if not is_windows:
-        build_contents += """\
-alias(name = "pip",             actual = select({{":" + item: "@{py_repository}_" + item + "//:python_runtimes" for item in PLATFORMS if "windows" not in item}}))
-""".format(
-            py_repository = rctx.attr.user_repository_name,
-        )
     rctx.file("BUILD.bazel", build_contents)
 
     # Expose a Starlark file so rules can know what host platform we used and where to find an interpreter