further cleanup

Author: aignas

python/uv/private/uv_toolchains_repo_def.bzl renamed to python/uv/private/toolchains_hub.bzl

@@ -16,7 +16,7 @@
 
 load(":toolchain_types.bzl", "UV_TOOLCHAIN_TYPE")
 
-def uv_toolchains_repo_def(
+def toolchains_hub(
         *,
         name = None,
         names,
@@ -36,10 +36,11 @@ def uv_toolchains_repo_def(
     if len(names) != len(implementations):
         fail("Each name must have an implementation")
 
-    for i, name in enumerate(names):
+    padding = len(str(len(names)))  # get the number of digits
+    for i, name in sorted(enumerate(names), key = lambda x: -x[0]):
         # poor mans implementation leading 0
-        number_prefix = "000{}".format(i)
-        number_prefix = number_prefix[-3:]
+        number_prefix = ("0" * padding) + "{}".format(i)
+        number_prefix = number_prefix[-padding:]
 
         native.toolchain(
             name = "{}_{}".format(number_prefix, name),

python/uv/private/uv.bzl

@@ -323,10 +323,11 @@ def process_modules(
                 str(label)
                 for label in platform.compatible_with
             ]
-            toolchain_target_settings[toolchain_name] = [
-                str(label)
-                for label in platform.target_settings
-            ]
+            if platform.target_settings:
+                toolchain_target_settings[toolchain_name] = [
+                    str(label)
+                    for label in platform.target_settings
+                ]
 
     return hub_repo(
         name = hub_name,

python/uv/private/uv_toolchains_repo.bzl

@@ -17,7 +17,7 @@
 load("//python/private:text_util.bzl", "render")
 
 _TEMPLATE = """\
-load("@rules_python//python/uv/private:uv_toolchains_repo_def.bzl", "uv_toolchains_repo_def")
+load("@rules_python//python/uv/private:toolchains_hub.bzl", "toolchains_hub")
 
 {}
 """
@@ -28,7 +28,7 @@ def _non_empty(d):
 def _toolchains_repo_impl(repository_ctx):
     contents = _TEMPLATE.format(
         render.call(
-            "uv_toolchains_repo_def",
+            "toolchains_hub",
             names = render.list(repository_ctx.attr.toolchain_names),
             implementations = render.dict(
                 repository_ctx.attr.toolchain_implementations,

tests/uv/uv/uv_tests.bzl

@@ -208,17 +208,15 @@ def _test_manual_url_spec(env):
     )
 
     uv.names().contains_exactly([
-        "uv_1_0_0_linux_toolchain",
+        "1_0_0_linux",
     ])
     uv.implementations().contains_exactly({
-        "uv_1_0_0_linux_toolchain": "@uv_1_0_0_linux//:uv_toolchain",
+        "1_0_0_linux": "@uv_1_0_0_linux//:uv_toolchain",
     })
     uv.compatible_with().contains_exactly({
-        "uv_1_0_0_linux_toolchain": ["@platforms//os:linux"],
-    })
-    uv.target_settings().contains_exactly({
-        "uv_1_0_0_linux_toolchain": [],
+        "1_0_0_linux": ["@platforms//os:linux"],
     })
+    uv.target_settings().contains_exactly({})
     env.expect.that_collection(calls).contains_exactly([
         {
             "name": "uv_1_0_0_linux",
@@ -256,16 +254,16 @@ def _test_defaults(env):
     )
 
     uv.names().contains_exactly([
-        "uv_1_0_0_linux_toolchain",
+        "1_0_0_linux",
     ])
     uv.implementations().contains_exactly({
-        "uv_1_0_0_linux_toolchain": "@uv_1_0_0_linux//:uv_toolchain",
+        "1_0_0_linux": "@uv_1_0_0_linux//:uv_toolchain",
     })
     uv.compatible_with().contains_exactly({
-        "uv_1_0_0_linux_toolchain": ["@platforms//os:linux"],
+        "1_0_0_linux": ["@platforms//os:linux"],
     })
     uv.target_settings().contains_exactly({
-        "uv_1_0_0_linux_toolchain": ["//:my_flag"],
+        "1_0_0_linux": ["//:my_flag"],
     })
     env.expect.that_collection(calls).contains_exactly([
         {
@@ -310,20 +308,19 @@ def _test_default_building(env):
     )
 
     uv.names().contains_exactly([
-        "uv_1_0_0_linux_toolchain",
-        "uv_1_0_0_osx_toolchain",
+        "1_0_0_linux",
+        "1_0_0_osx",
     ])
     uv.implementations().contains_exactly({
-        "uv_1_0_0_linux_toolchain": "@uv_1_0_0_linux//:uv_toolchain",
-        "uv_1_0_0_osx_toolchain": "@uv_1_0_0_osx//:uv_toolchain",
+        "1_0_0_linux": "@uv_1_0_0_linux//:uv_toolchain",
+        "1_0_0_osx": "@uv_1_0_0_osx//:uv_toolchain",
     })
     uv.compatible_with().contains_exactly({
-        "uv_1_0_0_linux_toolchain": ["@platforms//os:linux"],
-        "uv_1_0_0_osx_toolchain": ["@platforms//os:osx"],
+        "1_0_0_linux": ["@platforms//os:linux"],
+        "1_0_0_osx": ["@platforms//os:osx"],
     })
     uv.target_settings().contains_exactly({
-        "uv_1_0_0_linux_toolchain": ["//:my_flag"],
-        "uv_1_0_0_osx_toolchain": [],
+        "1_0_0_linux": ["//:my_flag"],
     })
     env.expect.that_collection(calls).contains_exactly([
         {
@@ -388,29 +385,24 @@ def _test_complex_configuring(env):
     )
 
     uv.names().contains_exactly([
-        "uv_1_0_0_osx_toolchain",
-        "uv_1_0_1_osx_toolchain",
-        "uv_1_0_2_osx_toolchain",
-        "uv_1_0_3_linux_toolchain",
+        "1_0_0_osx",
+        "1_0_1_osx",
+        "1_0_2_osx",
+        "1_0_3_linux",
     ])
     uv.implementations().contains_exactly({
-        "uv_1_0_0_osx_toolchain": "@uv_1_0_0_osx//:uv_toolchain",
-        "uv_1_0_1_osx_toolchain": "@uv_1_0_1_osx//:uv_toolchain",
-        "uv_1_0_2_osx_toolchain": "@uv_1_0_2_osx//:uv_toolchain",
-        "uv_1_0_3_linux_toolchain": "@uv_1_0_3_linux//:uv_toolchain",
+        "1_0_0_osx": "@uv_1_0_0_osx//:uv_toolchain",
+        "1_0_1_osx": "@uv_1_0_1_osx//:uv_toolchain",
+        "1_0_2_osx": "@uv_1_0_2_osx//:uv_toolchain",
+        "1_0_3_linux": "@uv_1_0_3_linux//:uv_toolchain",
     })
     uv.compatible_with().contains_exactly({
-        "uv_1_0_0_osx_toolchain": ["@platforms//os:os"],
-        "uv_1_0_1_osx_toolchain": ["@platforms//os:os"],
-        "uv_1_0_2_osx_toolchain": ["@platforms//os:different"],
-        "uv_1_0_3_linux_toolchain": ["@platforms//os:linux"],
-    })
-    uv.target_settings().contains_exactly({
-        "uv_1_0_0_osx_toolchain": [],
-        "uv_1_0_1_osx_toolchain": [],
-        "uv_1_0_2_osx_toolchain": [],
-        "uv_1_0_3_linux_toolchain": [],
+        "1_0_0_osx": ["@platforms//os:os"],
+        "1_0_1_osx": ["@platforms//os:os"],
+        "1_0_2_osx": ["@platforms//os:different"],
+        "1_0_3_linux": ["@platforms//os:linux"],
     })
+    uv.target_settings().contains_exactly({})
     env.expect.that_collection(calls).contains_exactly([
         {
             "name": "uv_1_0_0_osx",

tests/uv/uv_toolchains/BUILD.bazel

@@ -1,6 +1,6 @@
-load("//python/uv/private:uv_toolchains_repo_def.bzl", "uv_toolchains_repo_def")  # buildifier: disable=bzl-visibility
+load("//python/uv/private:toolchains_hub.bzl", "toolchains_hub")  # buildifier: disable=bzl-visibility
 
-uv_toolchains_repo_def(
+toolchains_hub(
     implementations = {
         "bar": "//tests/uv/uv:fake_bar",
         "foo": "//tests/uv/uv:fake_foof",