wip

Author: aignas

docs/requirements.txt

@@ -10,9 +10,9 @@ alabaster==1.0.0 \
     --hash=sha256:c00dca57bca26fa62a6d7d0a9fcce65f3e026e9bfe33e9c538fd3fbb2144fd9e \
     --hash=sha256:fc6786402dc3fcb2de3cabd5fe455a2db534b371124f1f21de8731783dec828b
     # via sphinx
-astroid==3.3.8 \
-    --hash=sha256:187ccc0c248bfbba564826c26f070494f7bc964fd286b6d9fff4420e55de828c \
-    --hash=sha256:a88c7994f914a4ea8572fac479459f4955eeccc877be3f2d959a33273b0cf40b
+astroid==3.3.9 \
+    --hash=sha256:622cc8e3048684aa42c820d9d218978021c3c3d174fb03a9f0d615921744f550 \
+    --hash=sha256:d05bfd0acba96a7bd43e222828b7d9bc1e138aaeb0649707908d3702a9831248
     # via sphinx-autodoc2
 babel==2.17.0 \
     --hash=sha256:0c54cffb19f690cdcc52a3b50bcbf71e07a808d1c80d549f2459b9d2cf0afb9d \
@@ -135,9 +135,9 @@ imagesize==1.4.1 \
     --hash=sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b \
     --hash=sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a
     # via sphinx
-jinja2==3.1.5 \
-    --hash=sha256:8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb \
-    --hash=sha256:aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb
+jinja2==3.1.6 \
+    --hash=sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d \
+    --hash=sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67
     # via
     #   myst-parser
     #   readthedocs-sphinx-ext
@@ -306,9 +306,9 @@ snowballstemmer==2.2.0 \
     --hash=sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1 \
     --hash=sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a
     # via sphinx
-sphinx==8.2.1 \
-    --hash=sha256:b5d2bb3cdf6207fcacde9f92085d2b97667b05b9c346eaec426ca4be8af505e9 \
-    --hash=sha256:e4b932951b9c18b039f73b72e4e63afe967d90408700ec222b981ac24647c01e
+sphinx==8.2.3 \
+    --hash=sha256:398ad29dee7f63a75888314e9424d40f52ce5a6a87ae88e7071e80af296ec348 \
+    --hash=sha256:4405915165f13521d875a8c29c8970800a0141c14cc5416a38feca4ea5d9b9c3
     # via
     #   rules-python-docs (docs/pyproject.toml)
     #   myst-parser

python/uv/private/lock.bzl

@@ -16,7 +16,6 @@
 """
 
 load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
-load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("//python:py_binary.bzl", "py_binary")
 load("//python/private:bzlmod_enabled.bzl", "BZLMOD_ENABLED")  # buildifier: disable=bzl-visibility
@@ -25,17 +24,6 @@ visibility(["//..."])
 
 _REQUIREMENTS_TARGET_COMPATIBLE_WITH = [] if BZLMOD_ENABLED else ["@platforms//:incompatible"]
 
-_RunLockInfo = provider(
-    doc = "Information for running the underlying Sphinx command directly",
-    fields = {
-        "cmd": """
-:type: Target
-
-The locker binary to run.
-""",
-    },
-)
-
 def _impl(ctx):
     args = ctx.actions.args()
 
@@ -47,15 +35,12 @@ def _impl(ctx):
             ctx.files.src_outs[0].path,
         ])
     args.add("--output-file", ctx.outputs.out)
-
-    # TODO @aignas 2025-03-02: add the following deps to _RunLockInfo
-    srcs = ctx.files.srcs + ctx.files.src_outs
     args.add_all(ctx.files.srcs)
 
     ctx.actions.run(
         executable = ctx.executable.cmd,
         mnemonic = "RulesPythonLock",
-        inputs = srcs,
+        inputs = ctx.files.srcs + ctx.files.src_outs,
         outputs = [
             ctx.outputs.out,
         ],
@@ -67,10 +52,7 @@ def _impl(ctx):
         env = ctx.attr.env,
     )
 
-    return [
-        DefaultInfo(files = depset([ctx.outputs.out])),
-        _RunLockInfo(cmd = ctx.executable.cmd),
-    ]
+    return [DefaultInfo(files = depset([ctx.outputs.out]))]
 
 _lock = rule(
     implementation = _impl,
@@ -79,7 +61,7 @@ _lock = rule(
     attrs = {
         "args": attr.string_list(),
         "cmd": attr.label(
-            default = "//python/uv/private:pip_compile",
+            mandatory = True,
             executable = True,
             cfg = "target",
         ),
@@ -90,6 +72,25 @@ _lock = rule(
     },
 )
 
+def _glob(path):
+    """A small function to return a list of existing outputs.
+
+    If the file referenced by the input argument exists, then it will return
+    it, otherwise it will return an empty list. This is useful to for programs
+    like pip-compile which behave differently if the output file exists and
+    update the output file in place.
+
+    The API of the function ensures that path is not a glob itself.
+
+    Args:
+        path: {type}`str` the file name.
+    """
+    for p in native.glob([path], allow_empty = True):
+        if path == p:
+            return [p]
+
+    return []
+
 def lock(*, name, srcs, out, args = [], **kwargs):
     """Pin the requirements based on the src files.
 
@@ -108,17 +109,11 @@ def lock(*, name, srcs, out, args = [], **kwargs):
         **kwargs: Extra kwargs passed to the {obj}`py_binary` rule.
     """
     pkg = native.package_name()
-    update_target = name + ".update"
-
-    user_args = args
-
-    existing_outputs = []
-    for path in native.glob([out], allow_empty = True):
-        if path == out:
-            existing_outputs = [out]
-            break
+    update_target = "{}.update".format(name)
+    locker_target = "{}.run".format(name)
 
     # TODO @aignas 2025-03-02: move the following args to a template expansion action
+    user_args = args
     args = [
         # FIXME @aignas 2025-03-02: this acts differently in native_binary and the rule
         "--custom-compile-command='bazel run //{}:{}'".format(pkg, update_target),
@@ -129,10 +124,30 @@ def lock(*, name, srcs, out, args = [], **kwargs):
         "--no-cache",
     ]
     args += user_args
+    run_args = []
+
+    existing_outputs = _glob(out)
+    if existing_outputs:
+        # This means that the output file already exists and it should be used
+        # to create a new file. This will be taken care by the locker tool.
+        #
+        # TODO @aignas 2025-03-02: similarly to sphinx rule, expand the output to short_path
+        run_args += ["--output-file", "$(rootpath {})".format(existing_outputs[0])]
+    else:
+        # TODO @aignas 2025-03-02: pass the output as a string
+        run_out = "{}/{}".format(pkg, out)
+        run_args += ["--output-file", run_out]
+
+    # args just get passed as is
+    run_args += [
+        # TODO @aignas 2025-03-02: get the full source location for these
+        "$(rootpath {})".format(s)
+        for s in srcs
+    ]
 
     expand_template(
-        name = name + "_locker_src",
-        out = name + "_locker.py",
+        name = locker_target + "_gen",
+        out = locker_target + ".py",
         template = "//python/uv/private:pip_compile.py",
         substitutions = {
             "    args = []": "    args = " + repr(args),
@@ -141,11 +156,12 @@ def lock(*, name, srcs, out, args = [], **kwargs):
     )
 
     py_binary(
-        name = name + "_locker",
-        srcs = [name + "_locker.py"],
+        name = locker_target,
+        srcs = [locker_target + ".py"],
         data = [
             "//python/uv:current_toolchain",
-        ],
+        ] + srcs + existing_outputs,
+        args = run_args,
         tags = ["manual"],
         deps = ["//python/runfiles"],
     )
@@ -165,45 +181,13 @@ def lock(*, name, srcs, out, args = [], **kwargs):
         ],
         args = args,
         target_compatible_with = _REQUIREMENTS_TARGET_COMPATIBLE_WITH,
-        cmd = name + "_locker",
-    )
-
-    run_args = []
-    if existing_outputs:
-        # This means that the output file already exists and it should be used
-        # to create a new file. This will be taken care by the locker tool.
-        #
-        # TODO @aignas 2025-03-02: similarly to sphinx rule, expand the output to short_path
-        run_args += ["--output-file", "$(location {})".format(existing_outputs[0])]
-    else:
-        # TODO @aignas 2025-03-02: pass the output as a string
-        run_out = "{}/{}".format(pkg, out)
-        run_args += ["--output-file", run_out]
-
-    # args just get passed as is
-    run_args += args + [
-        # TODO @aignas 2025-03-02: get the full source location for these
-        "$(location {})".format(s)
-        for s in srcs
-    ]
-
-    native_binary(
-        # this is expand_template using the stuff from the provider from the _lock rule
-        name = name + ".run",
-        args = run_args,  # the main difference is the expansion of args here
-        data = srcs + existing_outputs,  # This only depends on inputs to the _lock
-        src = "//python/uv/private:pip_compile",
-        tags = [
-            "local",
-            "manual",
-            "no-cache",
-        ],
+        cmd = locker_target,
     )
 
     # Write a script that can be used for updating the in-tree version of the
     # requirements file
     write_file(
-        name = name + ".update_gen",
+        name = update_target + "_gen",
         out = update_target + ".py",
         content = [
             "from os import environ",

python/uv/private/pip_compile.py

@@ -32,8 +32,6 @@ def _run() -> None:
     else:
         out = sys_args[1]
 
-    srcs = sys_args[2:]
-
     # this is set under bazel run
     workspace = env.get("BUILD_WORKSPACE_DIRECTORY")
     if workspace:
@@ -44,8 +42,9 @@ def _run() -> None:
         import shutil
 
         shutil.copy(src, dst)
+    sys_args[1] = str(dst)
 
-    uv_args = ["pip", "compile"] + args + srcs + ["--output-file", str(dst)]
+    uv_args = ["pip", "compile"] + args + sys_args
 
     if sys.platform == "win32":
         import subprocess