wip

Author: aignas

docs/BUILD.bazel

@@ -172,9 +172,6 @@ lock(
     args = [
         "--universal",
     ],
-    run_args = [
-        "--upgrade",
-    ],
     visibility = ["//private:__pkg__"],
 )
 

python/uv/private/lock.bzl

@@ -63,7 +63,6 @@ def _lock_impl(ctx):
     run_args = [param_file.path]
     args = ctx.actions.args()
     args.add_all(run_args)
-    args.add_all(ctx.attr.run_args)
 
     cmd = ctx.executable._cmd
 
@@ -119,9 +118,12 @@ def _run_lock_impl(ctx):
     )
 
     executable = ctx.actions.declare_file(ctx.label.name + ".exe")
-    ctx.actions.symlink(
+    ctx.actions.write(
         output = executable,
-        target_file = run_info.cmd_file,
+        content = "#!/usr/bin/env bash\nset -eux\nexec {} {} \"$@\"".format(
+            run_info.cmd_file.short_path,
+            run_info.args.short_path,
+        ),
         is_executable = True,
     )
 
@@ -152,7 +154,7 @@ _run_lock = rule(
     executable = True,
 )
 
-def lock(*, name, srcs, out, args = [], run_args = [], **kwargs):
+def lock(*, name, srcs, out, args = [], **kwargs):
     """Pin the requirements based on the src files.
 
     Differences with the current {obj}`compile_pip_requirements` rule:
@@ -196,14 +198,12 @@ def lock(*, name, srcs, out, args = [], run_args = [], **kwargs):
             "no-cache",
         ],
         args = args,
-        run_args = run_args,
         target_compatible_with = _REQUIREMENTS_TARGET_COMPATIBLE_WITH,
     )
 
     _run_lock(
         name = locker_target,
         lock = name,
-        args = run_args,
     )
 
     if maybe_out:

python/uv/private/pip_compile.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-import argparse
 import os
 import sys
 from pathlib import Path
@@ -20,26 +19,24 @@ def _run() -> None:
     uv = os.fsdecode(uv_path)
     env = os.environ.copy()
 
-    # TODO @aignas 2025-03-11: this does not work when we try to pass extra args via bazel run
-    # The best way is to do a template expansion.
+    params = Path(sys.argv[1])
+    sys_args = sys.argv[2:]
 
-    params = Path(f"{sys.argv[0]}.params.txt")
-    assert params.exists(), f"{params} does not exist"
-    sys_args = params.read_text().strip().split("\n")
+    uv_args = params.read_text().strip().split("\n")
 
     # Let `uv` know that it was spawned by this Python interpreter
     env["UV_INTERNAL__PARENT_INTERPRETER"] = sys.executable
     args = []
-    src_out = sys_args[1] if sys_args[0] == "--src-out" else None
+    src_out = uv_args[1] if uv_args[0] == "--src-out" else None
     if src_out:
-        sys_args = sys_args[2:]
+        uv_args = uv_args[2:]
 
-    if sys_args[0] != "--output-file":
+    if uv_args[0] != "--output-file":
         raise ValueError(
-            f"The first arg should be to declare the output file, got:\n{sys_args}"
+            f"The first arg should be to declare the output file, got:\n{uv_args}"
         )
     else:
-        out = sys_args[1]
+        out = uv_args[1]
 
     # this is set under bazel run
     workspace = env.get("BUILD_WORKSPACE_DIRECTORY")
@@ -51,9 +48,11 @@ def _run() -> None:
         import shutil
 
         shutil.copy(src, dst)
-    sys_args[1] = str(dst)
+    uv_args[1] = str(dst)
 
-    uv_args = ["pip", "compile"] + args + sys_args + uv_args
+    args += uv_args + sys_args
+    uv_args = ["pip", "compile"] + args
+    print("Running 'uv pip compile' with args:\n\t{}".format("\n\t".join(args)))
 
     if sys.platform == "win32":
         import subprocess