Pre-commit changes

Author: aspect-marvin

.bcr/patches/remove_dev_deps.patch

@@ -1,6 +1,6 @@
---- 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 @@
+--- a/MODULE.bazel	2025-11-06 05:53:18.137728401 +0000
++++ b/MODULE.bazel	2025-11-06 05:53:18.137728401 +0000
+@@ -40,568 +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.
 
@@ -504,19 +504,24 @@
 -    venv_name = "default",
 -)
 -uv.lockfile(
+-    src = "//:uv.lock",
 -    hub_name = "pypi",
 -    venv_name = "default",
--    src = "//:uv.lock",
 -)
 -uv.declare_entrypoint(
--    requirement = "pytest",
 -    name = "pytest",
 -    entrypoint = "pytest:console_main",
+-    requirement = "pytest",
 -)
 -uv.declare_entrypoint(
--    requirement = "pytest",
 -    name = "py.test",
 -    entrypoint = "pytest:console_main",
+-    requirement = "pytest",
+-)
+-uv.annotate_requirements(
+-    src = "//:annotations.toml",
+-    hub_name = "pypi",
+-    venv_name = "default",
 -)
 -use_repo(uv, "pypi")
 -
@@ -553,8 +558,8 @@
 -
 -# 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")
 -
+-multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
 -multitool.hub(lockfile = "//tools:tools.lock.json")
  use_repo(multitool, "multitool")
 -

BUILD.bazel

@@ -1,7 +1,5 @@
 load("@gazelle//:def.bzl", "gazelle")
 load("@rules_python//python/pip_install:requirements.bzl", "compile_pip_requirements")
-load("@rules_python_gazelle_plugin//manifest:defs.bzl", "gazelle_python_manifest")
-load("@rules_python_gazelle_plugin//modules_mapping:def.bzl", "modules_mapping")
 
 # gazelle:exclude internal_python_deps.bzl
 # gazelle:exclude internal_deps.bzl

MODULE.bazel

@@ -540,19 +540,24 @@ uv.declare_venv(
     venv_name = "default",
 )
 uv.lockfile(
+    src = "//:uv.lock",
     hub_name = "pypi",
     venv_name = "default",
-    src = "//:uv.lock",
 )
 uv.declare_entrypoint(
-    requirement = "pytest",
     name = "pytest",
     entrypoint = "pytest:console_main",
+    requirement = "pytest",
 )
 uv.declare_entrypoint(
-    requirement = "pytest",
     name = "py.test",
     entrypoint = "pytest:console_main",
+    requirement = "pytest",
+)
+uv.annotate_requirements(
+    src = "//:annotations.toml",
+    hub_name = "pypi",
+    venv_name = "default",
 )
 use_repo(uv, "pypi")
 
@@ -589,8 +594,8 @@ bazel_dep(name = "rules_pkg", version = "1.1.0")
 
 # 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")
 
+multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
 multitool.hub(lockfile = "//tools:tools.lock.json")
 use_repo(multitool, "multitool")
 

annotations.toml

@@ -1,7 +1,7 @@
 ## Annotations.toml
 #
 # This is an aspect_rules_py//uv specific configuration file which allows
-# packages to be annoted with their build time dependencies. This fills a gap in
+# packages to be annotated with their build time dependencies. This fills a gap in
 # both the pylock and uv lockfile formats, neither of which allow for build
 # requirements to be specified.
 #

bazel/include/multitool.MODULE.bazel

@@ -2,7 +2,7 @@
 
 # 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")
 
+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

@@ -31,24 +31,24 @@ uv.declare_venv(
     venv_name = "default",
 )
 uv.lockfile(
+    src = "//:uv.lock",
     hub_name = "pypi",
     venv_name = "default",
-    src = "//:uv.lock",
 )
 uv.declare_entrypoint(
-    requirement = "pytest",
     name = "pytest",
     entrypoint = "pytest:console_main",
+    requirement = "pytest",
 )
 uv.declare_entrypoint(
-    requirement = "pytest",
     name = "py.test",
     entrypoint = "pytest:console_main",
+    requirement = "pytest",
 )
 uv.annotate_requirements(
+    src = "//:annotations.toml",
     hub_name = "pypi",
     venv_name = "default",
-    src = "//:annotations.toml"
 )
 use_repo(uv, "pypi")
 

e2e/MODULE.bazel

@@ -79,33 +79,32 @@ uv.declare_venv(
     venv_name = "say",
 )
 uv.lockfile(
+    src = "//cases/uv-deps-650/say:uv.lock",
     hub_name = "pypi",
     venv_name = "say",
-    src = "//cases/uv-deps-650/say:uv.lock",
 )
 uv.override_requirement(
     hub_name = "pypi",
-    venv_name = "say",
     requirement = "cowsay",
-    target = "//cases/uv-deps-650/third_party/cowsay:cowsay",
+    target = "//cases/uv-deps-650/third_party/cowsay",
+    venv_name = "say",
 )
 uv.declare_venv(
     hub_name = "pypi",
     venv_name = "airflow",
 )
 uv.lockfile(
-    hub_name = "pypi",
     src = "//cases/uv-deps-650/airflow:uv.lock",
+    hub_name = "pypi",
     venv_name = "airflow",
 )
 uv.declare_venv(
     hub_name = "pypi",
     venv_name = "psql",
 )
 uv.lockfile(
-    hub_name = "pypi",
     src = "//cases/uv-deps-650/crossbuild:uv.lock",
+    hub_name = "pypi",
     venv_name = "psql",
 )
-
 use_repo(uv, "pypi")

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

@@ -3,7 +3,10 @@ load("@aspect_rules_py//py:defs.bzl", "py_library")
 py_library(
     name = "cowsay",
     srcs = glob(["**/*.py"]),
-    data = glob(["**/*"], exclude=["**/*.py"]),
+    data = glob(
+        ["**/*"],
+        exclude = ["**/*.py"],
+    ),
     imports = ["."],
     visibility = ["//visibility:public"],
 )

py/tests/py-binary/BUILD.bazel

@@ -1,7 +1,6 @@
 load("@aspect_bazel_lib//lib:run_binary.bzl", "run_binary")
 load("@aspect_bazel_lib//lib:testing.bzl", "assert_contains")
 load("@pypi//:requirements.bzl", "requirement")
-load("//bazel:defs.bzl", "munge")
 load("//py:defs.bzl", "py_binary", "py_test")
 
 genrule(

uv/private/extension.bzl

@@ -130,7 +130,7 @@ def _parse_locks(module_ctx, venv_specs):
     for mod in module_ctx.modules:
         for lock in mod.tags.lockfile:
             req_whls = {}
-            
+
             if lock.hub_name not in venv_specs or lock.venv_name not in venv_specs[lock.hub_name]:
                 problems.append("Lock {} in {} refers to hub {} which is not configured for that module".format(lock.src, mod.name, lock.hub_name))
 
@@ -188,9 +188,11 @@ Please update your lockfile to provide build tools in order to enable sdist supp
 
 Problems:
 {problems}""".format(
-    lockfile=lock.src,
-    problems="\n".join([" - " + it for it in problems]
-)))
+                    lockfile = lock.src,
+                    problems = "\n".join(
+                        [" - " + it for it in problems],
+                    ),
+                ))
 
             # FIXME: Should validate the lockfile but for now just stash it
             # Validating in starlark kinda rots anyway
@@ -202,8 +204,8 @@ Problems:
     return lock_specs
 
 _default_annotations = struct(
-    per_package={},
-    default_build_deps=[
+    per_package = {},
+    default_build_deps = [
         {"name": "setuptools"},
         {"name": "build"},
     ],
@@ -232,7 +234,7 @@ def _parse_annotations(module_ctx, hub_specs, venv_specs):
             annotations = toml.decode_file(module_ctx, ann.src)
             if annotations.get("version") != "0.0.0":
                 fail("Annotations file %s doesn't specify a valid version= key" % ann.src)
-            
+
             for package in annotations.get("package", []):
                 if not "name" in package:
                     fail("Annotations file %s is invalid; all [[package]] entries must have a name" % ann.src)
@@ -449,7 +451,8 @@ def _sbuild_repos(module_ctx, lock_specs, annotation_specs, override_specs):
 
                 # Per-package build deps, plus global defaults
                 build_deps = {
-                    it["name"]: it for it in build_deps + venv_anns.default_build_deps
+                    it["name"]: it
+                    for it in build_deps + venv_anns.default_build_deps
                 }
 
                 # print("Creating sdist repo", name)
@@ -532,7 +535,7 @@ def _collect_entrypoints(module_ctx, lock_specs):
                 res = module_ctx.execute(
                     [
                         "tar",  # FIXME: Use a hermetic tar here somehow?
-                        "-xzOif",
+                        "-xzOf",
                         file,
                         "*.dist-info/entry_points.txt",
                     ],
@@ -789,10 +792,11 @@ def _uv_impl(module_ctx):
     venv_specs = _parse_venvs(module_ctx, hub_specs)
 
     lock_specs = _parse_locks(module_ctx, venv_specs)
-    
+
     annotation_specs = _parse_annotations(module_ctx, hub_specs, venv_specs)
 
     override_specs = _parse_overrides(module_ctx, venv_specs)
+
     # Roll through all the configured wheels, collect & validate the unique
     # platform configurations so that we can go create an appropriate power set
     # of conditions.