[NO TESTS] WIP

Author: arrdem

.bcr/patches/remove_dev_deps.patch

@@ -1,6 +1,6 @@
---- a/MODULE.bazel	2025-11-05 17:15:54.554716130 -0700
-+++ b/MODULE.bazel	2025-11-05 17:15:54.554774048 -0700
-@@ -47,563 +47,5 @@
+--- a/MODULE.bazel	2025-11-05 22:01:56.213559506 -0700
++++ b/MODULE.bazel	2025-11-05 22:01:56.213619467 -0700
+@@ -40,563 +40,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.
 
@@ -506,7 +506,7 @@
 -uv.lockfile(
 -    hub_name = "pypi",
 -    venv_name = "default",
--    lockfile = "//:uv.lock",
+-    src = "//:uv.lock",
 -)
 -uv.declare_entrypoint(
 -    requirement = "pytest",
@@ -552,8 +552,8 @@
 -# Multitool configuration
 -
 -# Multitool is a prod dep (for now) so we don't need this
--# bazel_dep(name = "rules_multitool", version = "1.9.0")
--# multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
+-bazel_dep(name = "rules_multitool", version = "1.9.0")
+-multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
 -
 -multitool.hub(lockfile = "//tools:tools.lock.json")
  use_repo(multitool, "multitool")

MODULE.bazel

@@ -13,10 +13,6 @@ 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.
-bazel_dep(name = "rules_multitool", version = "1.9.0")
-
 tools = use_extension("//py:extensions.bzl", "py_tools")
 tools.rules_py_tools()
 use_repo(tools, "rules_py_tools")
@@ -41,9 +37,6 @@ use_repo(
 host = use_extension("//uv/private/host:extension.bzl", "host_platform")
 use_repo(host, "aspect_rules_py_uv_host")
 
-multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
-multitool.hub(lockfile = "//uv/private/uv:uv.lock.json")
-
 # 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.
 
@@ -549,7 +542,7 @@ uv.declare_venv(
 uv.lockfile(
     hub_name = "pypi",
     venv_name = "default",
-    lockfile = "//:uv.lock",
+    src = "//:uv.lock",
 )
 uv.declare_entrypoint(
     requirement = "pytest",
@@ -595,8 +588,8 @@ bazel_dep(name = "rules_pkg", version = "1.1.0")
 # Multitool configuration
 
 # Multitool is a prod dep (for now) so we don't need this
-# bazel_dep(name = "rules_multitool", version = "1.9.0")
-# multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
+bazel_dep(name = "rules_multitool", version = "1.9.0")
+multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
 
 multitool.hub(lockfile = "//tools:tools.lock.json")
 use_repo(multitool, "multitool")

bazel/include/multitool.MODULE.bazel

@@ -1,8 +1,8 @@
 # Multitool configuration
 
 # Multitool is a prod dep (for now) so we don't need this
-# bazel_dep(name = "rules_multitool", version = "1.9.0")
-# multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
+bazel_dep(name = "rules_multitool", version = "1.9.0")
+multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
 
 multitool.hub(lockfile = "//tools:tools.lock.json")
 use_repo(multitool, "multitool")

bazel/include/python.MODULE.bazel

@@ -33,7 +33,7 @@ uv.declare_venv(
 uv.lockfile(
     hub_name = "pypi",
     venv_name = "default",
-    lockfile = "//:uv.lock",
+    src = "//:uv.lock",
 )
 uv.declare_entrypoint(
     requirement = "pytest",

e2e/MODULE.bazel

@@ -76,16 +76,16 @@ uv = use_extension("@aspect_rules_py//uv/unstable:extension.bzl", "uv")
 uv.declare_hub(hub_name = "pypi")
 uv.declare_venv(
     hub_name = "pypi",
-    venv_name = "default",
+    venv_name = "say",
 )
 uv.lockfile(
     hub_name = "pypi",
-    lockfile = "//cases/uv-deps-650:uv-default.lock",
-    venv_name = "default",
+    venv_name = "say",
+    src = "//cases/uv-deps-650/say:uv.lock",
 )
 uv.override_requirement(
     hub_name = "pypi",
-    venv_name = "default",
+    venv_name = "say",
     requirement = "cowsay",
     target = "//cases/uv-deps-650/third_party/cowsay:cowsay",
 )
@@ -95,7 +95,7 @@ uv.declare_venv(
 )
 uv.lockfile(
     hub_name = "pypi",
-    lockfile = "//cases/uv-deps-650:uv-airflow.lock",
+    src = "//cases/uv-deps-650/airflow:uv.lock",
     venv_name = "airflow",
 )
 uv.declare_venv(
@@ -104,7 +104,7 @@ uv.declare_venv(
 )
 uv.lockfile(
     hub_name = "pypi",
-    lockfile = "//cases/uv-deps-650:uv-psql.lock",
+    src = "//cases/uv-deps-650/crossbuild:uv.lock",
     venv_name = "psql",
 )
 

e2e/cases/uv-deps-650/BUILD.bazel

@@ -7,7 +7,7 @@ py_venv_test(
     ],
     main = "__test__.py",
     python_version = "3.11",
-    venv = "default",
+    venv = "say",
     deps = [
         "@pypi//cowsay",
     ],