Use with_cfg to implement the whl transition

Author: arrdem

.bcr/patches/remove_dev_deps.patch

@@ -1,6 +1,6 @@
---- a/MODULE.bazel	2025-11-05 12:16:36.670092448 -0700
-+++ b/MODULE.bazel	2025-11-05 12:16:36.670200199 -0700
-@@ -46,548 +46,5 @@
+--- a/MODULE.bazel	2025-11-05 15:06:52.140088163 -0700
++++ b/MODULE.bazel	2025-11-05 15:06:52.140147023 -0700
+@@ -47,546 +47,5 @@
  # HACK: In prod the includer's patch inserts the use_repo for multitool. This
  # solves the problem of needing a use_repo here in prod and below in dev.
 
@@ -170,7 +170,6 @@
 -# Rust configuration
 -
 -bazel_dep(name = "rules_rust", version = "0.67.0")
--
 -bazel_dep(name = "openssl", version = "3.3.1.bcr.6")
 -
 -RUST_EDITION = "2024"
@@ -529,7 +528,6 @@
 -
 -########################################
 -# from bazel/include/release.MODULE.bazel
--bazel_dep(name = "with_cfg.bzl", version = "0.11.0")
 -bazel_dep(name = "rules_pkg", version = "1.1.0")
 -
 -########################################

MODULE.bazel

@@ -11,6 +11,7 @@ bazel_dep(name = "bazel_lib", version = "3.0.0")
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
 bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_python", version = "1.0.0")
+bazel_dep(name = "with_cfg.bzl", version = "0.11.0")
 
 # FIXME: We're using this to pull in multitool for source builds. Could use an
 # internal tool instead.
@@ -570,7 +571,6 @@ http_file(
 
 ########################################
 # from bazel/include/release.MODULE.bazel
-bazel_dep(name = "with_cfg.bzl", version = "0.11.0")
 bazel_dep(name = "rules_pkg", version = "1.1.0")
 
 ########################################

bazel/include/release.MODULE.bazel

@@ -1,2 +1 @@
-bazel_dep(name = "with_cfg.bzl", version = "0.11.0")
 bazel_dep(name = "rules_pkg", version = "1.1.0")

uv/private/defs.bzl

@@ -0,0 +1,4 @@
+load("//py:defs.bzl", "py_library")
+load("@with_cfg.bzl", "with_cfg")
+
+py_whl_library, _ = with_cfg(py_library).set(Label("//uv/private/constraints:lib_mode"), "whl").build()

uv/private/hub/repository.bzl

@@ -18,37 +18,21 @@ def _hub_impl(repository_ctx):
     # out how to make this take "soft" rather than "hard" dependencies.
     repository_ctx.file("BUILD.bazel", """\
 load("@aspect_rules_py//py:defs.bzl", "py_library")
+load("@aspect_rules_py//uv/private:defs.bzl", "py_whl_library")
 
-alias(
-    name = "all",
-    actual = ":all_requirements",
-    visibility = ["//visibility:public"],
-)
-alias(
-    name = "all_requirements",
-    actual = select({{
-        "@aspect_rules_py//uv/private/constraints:libs_are_libs": ":all_lib",
-        "@aspect_rules_py//uv/private/constraints:libs_are_whls": ":all_whl_requirements",
-    }}),
-    visibility = ["//visibility:public"],
-)
 py_library(
-    name = "all_lib",
+    name = "all_requirements",
     deps = select({lib_arms}),
     visibility = ["//visibility:private"],
 )
-filegroup(
+py_whl_library(
     name = "all_whl_requirements",
-    srcs = select({whl_arms}),
+    deps = [":all_requirements"],
     visibility = ["//visibility:public"],
 )
 """.format(lib_arms = {
         "//venv:{}".format(venv): pkgs
         for venv, pkgs in venv_packages.items()
-    },
-           whl_arms = {
-        "//venv:{}".format(venv): [it.split(":")[0] + ":whl" for it in pkgs]
-        for venv, pkgs in venv_packages.items()
     }))
 
     ################################################################################

uv/private/venv_hub/repository.bzl

@@ -10,7 +10,9 @@ def _venv_hub_impl(repository_ctx):
     entrypoints = json.decode(repository_ctx.attr.entrypoints)
 
     for pkg, group in repository_ctx.attr.aliases.items():
-        content = []
+        content = [
+            """load("@aspect_rules_py//uv/private:defs.bzl", "py_whl_library")"""
+        ]
         content.append(
             """
 alias(
@@ -20,15 +22,12 @@ alias(
 )
 alias(
    name = "{pkg}",
-   actual = select({{
-       "@aspect_rules_py//uv/private/constraints:libs_are_libs": "//private/sccs:{scc}_lib",
-       "@aspect_rules_py//uv/private/constraints:libs_are_whls": "//private/sccs:{scc}_whl",
-   }}),
+   actual = "//private/sccs:{scc}_lib",
    visibility = ["//visibility:public"],
 )
-alias(
+py_whl_library(
    name = "whl",
-   actual = "//private/sccs:{scc}_whl",
+   deps = [":{pkg}"],
    visibility = ["//visibility:public"],
 )
 """.format(
@@ -102,11 +101,6 @@ py_library(
     imports = [],
     visibility = ["//visibility:private"]
 )
-filegroup(
-    name = "_empty_whl",
-    srcs = [],
-    visibility = ["//visibility:private"]
-)
 """,
     ]
 
@@ -150,13 +144,6 @@ alias(
         "//conditions:default": ":_empty_lib",
     }}),
 )
-alias(
-    name = "_{group}_{d}_whl",
-    actual = select({{
-        ":_maybe_{group}_{d}": "//{d}:whl",
-        "//conditions:default": ":_empty_whl",
-    }}),
-)
 """.format(
                         group = group,
                         d = d,
@@ -175,16 +162,9 @@ py_library(
    ],
    visibility = ["//:__subpackages__"],
 )
-filegroup(
-   name = "{name}_whl",
-   srcs = [
-{whl_deps}
-   ],
-   visibility = ["//:__subpackages__"],
-)""".format(
+""".format(
                 name=group,
                 lib_deps=",\n".join([((" " * 8) + it) for it in (member_installs + dep_labels)]),
-                whl_deps=",\n".join([((" " * 8) + it) for it in ([it.replace(":install", ":whl") for it in member_installs] + [(it[:-1] + ":whl\"") if "//" in it else it.replace("_lib", "_whl") for it in dep_labels])]),
             ),
         )
 

uv/private/whl_install/repository.bzl

@@ -65,8 +65,9 @@ def _whl_install_impl(repository_ctx):
     # The strategy here is to roll through the wheels,
     select_arms = {}
     content = [
-        "load(\"@aspect_rules_py//uv/private/whl_install:rule.bzl\", \"whl_install\")",
+        "load(\"@aspect_rules_py//py:defs.bzl\", \"py_library\")",
         "load(\"@aspect_rules_py//uv/private/whl_install:defs.bzl\", \"select_chain\")",
+        "load(\"@aspect_rules_py//uv/private/whl_install:rule.bzl\", \"whl_install\")",
         "load(\"@bazel_skylib//lib:selects.bzl\", \"selects\")",
     ]
 
@@ -135,7 +136,13 @@ def _whl_install_impl(repository_ctx):
 select_chain(
    name = "whl",
    arms = {},
-   visibility = ["//visibility:public"],
+   visibility = ["//visibility:private"],
+)
+py_library(
+   name = "whl_lib",
+   srcs = [],
+   data = [":whl"],
+   visibility = ["//visibility:private"],
 )
 """.format(
             _format_arms(select_arms),
@@ -146,8 +153,16 @@ select_chain(
     content.append(
         """
 whl_install(
-   name = "install",
+   name = "actual_install",
    src = ":whl",
+   visibility = ["//visibility:private"],
+)
+alias(
+   name = "install",
+   actual = select({
+        "@aspect_rules_py//uv/private/constraints:libs_are_libs": ":actual_install",
+        "@aspect_rules_py//uv/private/constraints:libs_are_whls": ":whl_lib",
+   }),
    visibility = ["//visibility:public"],
 )
 """,