Skip to content

Commit ad7f828

Browse files
committed
Pre-commit changes
1 parent 6139f65 commit ad7f828

File tree

8 files changed

+21
-20
lines changed

8 files changed

+21
-20
lines changed

MODULE.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ platforms = [
212212
# Rust configuration
213213

214214
bazel_dep(name = "rules_rust", version = "0.67.0")
215-
216215
bazel_dep(name = "openssl", version = "3.3.1.bcr.6")
217216

218217
RUST_EDITION = "2024"

bazel/include/rust.MODULE.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Rust configuration
22

33
bazel_dep(name = "rules_rust", version = "0.67.0")
4-
54
bazel_dep(name = "openssl", version = "3.3.1.bcr.6")
65

76
RUST_EDITION = "2024"

e2e/MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"Bazel dependencies"
22

33
include("//bazel/include:e2e.MODULE.bazel")
4+
45
include("//bazel/include:oci.MODULE.bazel")
56

67
python = use_extension("@rules_python//python/extensions:python.bzl", "python")

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
2-
load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load", "oci_image_index")
32
load("@aspect_rules_py//py:defs.bzl", "py_image_layer")
4-
load("@aspect_rules_py//py/unstable:defs.bzl", "py_venv_binary")
5-
load("@container_structure_test//:defs.bzl", "container_structure_test")
63
load("@aspect_rules_py//py/tests/py_image_layer:asserts.bzl", "assert_tar_listing")
4+
load("@aspect_rules_py//py/unstable:defs.bzl", "py_venv_binary")
5+
load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index")
76

87
platform(
98
name = "arm64_linux",
@@ -39,11 +38,11 @@ py_venv_binary(
3938
name = "app_bin",
4039
srcs = ["__main__.py"],
4140
main = "__main__.py",
41+
python_version = "3.12",
42+
venv = "psql",
4243
deps = [
4344
"@pypi//psycopg2_binary",
4445
],
45-
python_version = "3.12",
46-
venv = "psql",
4746
)
4847

4948
py_image_layer(

py/private/toolchain/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@bazel_lib//:bzl_library.bzl", "bzl_library")
2-
load(":tools.bzl", "resolved_venv_toolchain", "resolved_unpack_toolchain")
2+
load(":tools.bzl", "resolved_unpack_toolchain", "resolved_venv_toolchain")
33

44
exports_files(
55
["python.sh"],

py/private/toolchain/tools.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Declaration of concrete toolchains for our Rust tools"""
22

33
load("@bazel_skylib//lib:structs.bzl", "structs")
4-
load(":types.bzl", "PyToolInfo", "VENV_TOOLCHAIN", "UNPACK_TOOLCHAIN")
4+
load(":types.bzl", "PyToolInfo", "UNPACK_TOOLCHAIN", "VENV_TOOLCHAIN")
55

66
def PrebuiltToolConfig(
77
target,

uv/private/extension.bzl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,13 @@ def _parse_overrides(module_ctx, venv_specs):
182182
for override in mod.tags.override_requirement:
183183
if override.hub_name not in venv_specs:
184184
fail("Override %r references undeclared hub" % (override,))
185+
185186
# Insert a base mapping for the hub
186187
overrides.setdefault(override.hub_name, {})
187-
188+
188189
if override.venv_name not in venv_specs[override.hub_name]:
189190
fail("Override %r references venv not in the hub" % (override,))
191+
190192
# Insert a base mapping for the venv
191193
overrides[override.hub_name].setdefault(override.venv_name, {})
192194

@@ -315,7 +317,7 @@ def _raw_whl_repos(module_ctx, lock_specs, override_specs):
315317
# This is an overridden package, don't declare repos for it
316318
if override_specs.get(hub_name, {}).get(venv_name, {}).get(package["name"]):
317319
continue
318-
320+
319321
wheels = package.get("wheels", [])
320322
for whl in wheels:
321323
url = whl["url"]
@@ -468,7 +470,7 @@ def _whl_install_repos(module_ctx, lock_specs, override_specs):
468470
# This is an overridden package, don't declare a repo for it
469471
if override_specs.get(hub_name, {}).get(venv_name, {}).get(package["name"]):
470472
continue
471-
473+
472474
# This is where we need to actually choose which wheel we will
473475
# "install", and so this is where prebuild selection needs to
474476
# happen according to constraints.
@@ -574,7 +576,7 @@ def _group_repos(module_ctx, lock_specs, entrypoint_specs, override_specs):
574576
# Note that we're assuming ALL marker conditional deps are live.
575577
cycle_groups = sccs({k: v.keys() for k, v in graph.items()})
576578
# print(hub_name, venv_name, graph, cycle_groups)
577-
579+
578580
# Now we can assign names to the sccs and collect deps. Note that
579581
# _every_ node in the graph will be in _a_ scc, those sccs are just
580582
# size 1 if the node isn't part of a cycle.
@@ -778,7 +780,7 @@ _override_requirement = tag_class(
778780
"venv_name": attr.string(mandatory = True),
779781
"requirement": attr.string(mandatory = True),
780782
"target": attr.label(mandatory = True),
781-
}
783+
},
782784
)
783785

784786
uv = module_extension(

uv/private/host/repository.bzl

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,13 @@ def _platform(rctx):
3939
ver = res.stdout.split("\n")[1].split(" ")[-1].split(".")
4040
return "musl", "{}.{}".format(ver[0], ver[1])
4141

42-
# - Amazon Linux: "ldd (gnu libc ...) <ver>\n..."
43-
# - Arch Linux: "ldd (gnu libc ...) <ver>\n..."
44-
# - Debian: "ldd (debian glibc ...) <ver>\n..."
45-
# - Fedora: "ldd (gnu libc ...) <ver>\n..."
46-
# - Oracle Linux: "ldd (gnu libc ...) <ver>\n..."
47-
# - Ubuntu: "ldd (ubuntu glibc ...) <ver>\n..."
42+
# - Amazon Linux: "ldd (gnu libc ...) <ver>\n..."
43+
# - Arch Linux: "ldd (gnu libc ...) <ver>\n..."
44+
# - Debian: "ldd (debian glibc ...) <ver>\n..."
45+
# - Fedora: "ldd (gnu libc ...) <ver>\n..."
46+
# - Oracle Linux: "ldd (gnu libc ...) <ver>\n..."
47+
# - Ubuntu: "ldd (ubuntu glibc ...) <ver>\n..."
48+
4849
elif "glibc" in out or "gnu libc" in out:
4950
ver = res.stdout.split("\n")[0].split(")")[1].strip().split(".")
5051
major = ver[0]

0 commit comments

Comments
 (0)