Mark unstable; create a parallel whl tree

Author: arrdem

e2e/MODULE.bazel

@@ -72,7 +72,7 @@ importer = use_extension("//cases/repository-rule-deps-299/rules:import.bzl", "i
 use_repo(importer, "myrepo")
 
 # For cases/uv-deps-650
-uv = use_extension("@aspect_rules_py//uv:extension.bzl", "uv")
+uv = use_extension("@aspect_rules_py//uv/unstable:extension.bzl", "uv")
 uv.declare_hub(hub_name = "pypi")
 uv.declare_venv(
     hub_name = "pypi",

uv/private/hub/repository.bzl

@@ -21,12 +21,25 @@ load("@aspect_rules_py//py:defs.bzl", "py_library")
 
 py_library(
     name = "all",
-    deps = select({arms}),
+    deps = select({lib_arms}),
     visibility = ["//visibility:public"],
 )
-""".format(arms = {
+alias(
+    name = "all_requirements",
+    actual = ":all",
+)
+filegroup(
+    name = "all_whl_requirements",
+    srcs = select({whl_arms}),
+    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()
     }))
 
     ################################################################################
@@ -130,18 +143,33 @@ load("//:defs.bzl", "pip")
             """
 # This target is for a "hard" dependency.
 # Dependencies on this target will cause build failures if it's unavailable.
+alias(
+    name = "lib",
+    actual = "{name}",
+    visibility = ["//visibility:public"],
+)
 alias(
     name = "{name}",
     actual = select(
-      {select},
+      {lib_select},
+      no_match_error = "{error}",
+    ),
+    target_compatible_with = pip.compatible_with({compat}),
+    visibility = ["//visibility:public"],
+)
+alias(
+    name = "whl",
+    actual = select(
+      {whl_select},
       no_match_error = "{error}",
     ),
     target_compatible_with = pip.compatible_with({compat}),
     visibility = ["//visibility:public"],
 )
 """.format(
                 name = name,
-                select = repr(select_spec),
+                lib_select = repr(select_spec),
+                whl_select = repr({k: v.split(":")[0] + ":whl" for k, v in select_spec.items()}),
                 compat = repr(spec),
                 error = error,
             ),

uv/private/venv_hub/repository.bzl

@@ -20,7 +20,12 @@ alias(
 )
 alias(
    name = "{pkg}",
-   actual = "//private/sccs:{scc}",
+   actual = "//private/sccs:{scc}_lib",
+   visibility = ["//visibility:public"],
+)
+alias(
+   name = "whl",
+   actual = "//private/sccs:{scc}_whl",
    visibility = ["//visibility:public"],
 )
 """.format(
@@ -81,7 +86,6 @@ decide_marker(
 
     # JSON decode the marker mapping so we can use it
     scc_markers = json.decode(repository_ctx.attr.scc_markers)
-    print(scc_markers)
 
     content = [
         "# FIXME",
@@ -90,11 +94,16 @@ decide_marker(
         """
 # A placeholder library which allows us to select to nothing
 py_library(
-    name = "empty",
+    name = "_empty_lib",
     srcs = [],
     imports = [],
     visibility = ["//visibility:private"]
 )
+filegroup(
+    name = "_empty_whl",
+    srcs = [],
+    visibility = ["//visibility:private"]
+)
 """,
     ]
 
@@ -120,8 +129,6 @@ py_library(
                 dep_labels.append("\"//%s\"" % d)
 
             else:
-                print("Got markers", markers)
-
                 # Hard case of generating a conditional dep
                 content.append(
                     """
@@ -134,10 +141,17 @@ selects.config_setting_group(
 
 # Depend on {d} of any of the {group} markers is active
 alias(
-    name = "_{group}_{d}",
+    name = "_{group}_{d}_lib",
     actual = select({{
         ":_maybe_{group}_{d}": "//{d}",
-        "//conditions:default": ":empty",
+        "//conditions:default": ":_empty_lib",
+    }}),
+)
+alias(
+    name = "_{group}_{d}_whl",
+    actual = select({{
+        ":_maybe_{group}_{d}": "//{d}:whl",
+        "//conditions:default": ":_empty_whl",
     }}),
 )
 """.format(
@@ -146,21 +160,28 @@ alias(
                         markers = ["//private/markers:%s" % it for it in markers],
                     ),
                 )
-                dep_labels.append("\":_{}_{}\"".format(group, d))
+                dep_labels.append("\":_{}_{}_lib\"".format(group, d))
 
         content.append(
             """
 py_library(
-   name = "{}",
+   name = "{name}_lib",
    srcs = [],
    deps = [
-{}
+{lib_deps}
    ],
    visibility = ["//:__subpackages__"],
 )
-""".format(
-                group,
-                ",\n".join([((" " * 8) + it) for it in (member_installs + dep_labels)]),
+filegroup(
+   name = "{name}_whl",
+   srcs = [
+{whl_deps}
+   ],
+   visibility = ["//:__subpackages__"],
+)""".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/defs.bzl

@@ -2,7 +2,7 @@
 Helpers.
 """
 
-def select_chain(name, arms):
+def select_chain(name, arms, visibility = ["//visibility:private"]):
     """
     Generate an ordered select chain.
 
@@ -30,4 +30,5 @@ def select_chain(name, arms):
                     condition: target,
                 },
             ),
+            visibility = visibility,
         )

uv/private/whl_install/repository.bzl

@@ -133,8 +133,9 @@ def _whl_install_impl(repository_ctx):
     content.append(
         """
 select_chain(
-   name = 'whl',
+   name = "whl",
    arms = {},
+   visibility = ["//visibility:public"],
 )
 """.format(
             _format_arms(select_arms),