wip

Author: aignas

python/uv/private/copy.py

@@ -1,14 +1,50 @@
+import sys
+from difflib import unified_diff
 from os import environ
 from pathlib import Path
-from sys import stderr
 
-src = Path(environ["REQUIREMENTS_FILE"])
-assert src.exists(), f"the {src} file does not exist"
-dst = ""
 
-print(f"cp <bazel-sandbox>/{src}\\n    -> <workspace>/{dst}", file=stderr)
-build_workspace = Path(environ["BUILD_WORKSPACE_DIRECTORY"])
+def main():
+    src = ""
+    dst = ""
 
-dst = build_workspace / dst
-dst.write_text(src.read_text())
-print("Success!", file=stderr)
+    src = Path(src)
+    assert src.exists(), f"the {src} file does not exist"
+
+    if "BUILD_WORKSPACE_DIRECTORY" not in environ:
+        dst = Path(dst)
+        a = dst.read_text() if dst.exists() else "\n"
+        b = src.read_text()
+
+        diff = unified_diff(
+            a.splitlines(),
+            b.splitlines(),
+            str(dst),
+            str(src),
+            lineterm="",
+        )
+        diff = "\n".join(list(diff))
+        print(diff)
+        print(
+            """\
+
+===============================================================================
+The in source file copy is out of date, please run the failed test target with
+'bazel run' to fix the error message update the source file copy.
+===============================================================================
+"""
+        )
+        return 1 if diff else 0
+
+    print(f"cp <bazel-sandbox>/{src}", file=sys.stderr)
+    print(f"    -> <workspace>/{dst}", file=sys.stderr)
+    build_workspace = Path(environ["BUILD_WORKSPACE_DIRECTORY"])
+
+    dst = build_workspace / dst
+    dst.write_text(src.read_text())
+    print("Success!", file=sys.stderr)
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

python/uv/private/lock.bzl

@@ -17,7 +17,7 @@
 
 load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
 load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
-load("//python:py_binary.bzl", "py_binary")
+load("//python:py_test.bzl", "py_test")
 
 visibility(["//..."])
 
@@ -78,6 +78,7 @@ def _lock_impl(ctx):
     lock_args.add("--custom-compile-command", update_command)
     run_args.extend(("--custom-compile-command", "'{}'".format(update_command)))
 
+    lock_args.add("--no-progress")
     lock_args.add("--python", py_runtime.interpreter)
     lock_args.add_all(args)
     lock_args.add_all(srcs)
@@ -225,7 +226,7 @@ def lock(*, name, srcs, out, args = [], **kwargs):
         srcs: The srcs to use as inputs.
         out: The output file.
         args: Extra args to pass to `uv`.
-        **kwargs: Extra kwargs passed to the {obj}`py_binary` rule.
+        **kwargs: Extra kwargs passed to the {obj}`py_test` rule.
     """
     pkg = native.package_name()
     update_target = "{}.update".format(name)
@@ -249,14 +250,6 @@ def lock(*, name, srcs, out, args = [], **kwargs):
         args = args,
     )
 
-    if maybe_out:
-        diff_test(
-            name = name + "_test",
-            file1 = out + ".new",
-            file2 = maybe_out,
-            tags = ["manual"],
-        )
-
     _lock_run(
         name = locker_target,
         lock = name,
@@ -271,16 +264,21 @@ def lock(*, name, srcs, out, args = [], **kwargs):
         template = "//python/uv/private:copy.py",
         substitutions = {
             'dst = ""': 'dst = "{}/{}"'.format(pkg, out),
+            'src = ""': 'src = "{}/{}.new"'.format(pkg, out),
         },
     )
 
-    py_binary(
+    py_test(
         name = update_target,
         srcs = [update_target + ".py"],
-        data = [name],
-        env = {
-            "REQUIREMENTS_FILE": "$(rootpath {})".format(name),
-        },
-        tags = ["manual"],
+        data = [name] + ([] if not maybe_out else [maybe_out]),
         **kwargs
     )
+
+    if maybe_out:
+        diff_test(
+            name = name + "_test",
+            file1 = out + ".new",
+            file2 = maybe_out,
+            tags = ["manual"],
+        )