Skip to content

Commit ff8e27f

Browse files
authored
fix: add tar.bzl as dep since its needed sdist_build (#751)
1 parent 58e5ddf commit ff8e27f

File tree

6 files changed

+14
-29
lines changed

6 files changed

+14
-29
lines changed

.bcr/patches/remove_dev_deps.patch

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- a/MODULE.bazel 2025-12-08 16:08:38.084434215 -0800
2-
+++ b/MODULE.bazel 2025-12-08 16:08:38.084453581 -0800
3-
@@ -47,545 +47,3 @@
1+
--- a/MODULE.bazel 2025-12-11 15:32:06.556883760 -0800
2+
+++ b/MODULE.bazel 2025-12-11 15:32:06.556900451 -0800
3+
@@ -51,537 +51,3 @@
44
# HACK: In prod the includer's patch inserts the use_repo for multitool. This
55
# solves the problem of needing a use_repo here in prod and below in dev.
66

@@ -448,14 +448,6 @@
448448
- remote = "https://github.com/GoogleContainerTools/container-structure-test.git",
449449
-)
450450
-
451-
-# Used for testing container layers
452-
-bazel_dep(name = "tar.bzl", version = "0.5.5")
453-
-
454-
-bazel_lib_toolchains = use_extension("@tar.bzl//tar:extensions.bzl", "toolchains")
455-
-use_repo(bazel_lib_toolchains, "bsd_tar_toolchains")
456-
-
457-
-register_toolchains("@bsd_tar_toolchains//:all")
458-
-
459451
-########################################
460452
-# from bazel/include/python.MODULE.bazel
461453
-# rules_python and friends

.bcr/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
bcr_test_module:
22
module_path: "e2e"
33
matrix:
4-
bazel: ["8.x", "7.x"]
4+
bazel: ["8.x"]
55
# TODO(#9): add windows to this list
66
platform: ["debian10", "macos", "ubuntu2004"]
77
tasks:

MODULE.bazel

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ bazel_dep(name = "platforms", version = "1.0.0")
1414
bazel_dep(name = "rules_python", version = "1.0.0")
1515
bazel_dep(name = "with_cfg.bzl", version = "0.11.0")
1616
bazel_dep(name = "rules_cc", version = "0.2.11")
17+
bazel_dep(name = "tar.bzl", version = "0.5.5")
18+
19+
bazel_lib_toolchains = use_extension("@tar.bzl//tar:extensions.bzl", "toolchains")
20+
use_repo(bazel_lib_toolchains, "bsd_tar_toolchains")
1721

1822
tools = use_extension("//py:extensions.bzl", "py_tools")
1923
tools.rules_py_tools()
@@ -491,14 +495,6 @@ git_override(
491495
remote = "https://github.com/GoogleContainerTools/container-structure-test.git",
492496
)
493497

494-
# Used for testing container layers
495-
bazel_dep(name = "tar.bzl", version = "0.5.5")
496-
497-
bazel_lib_toolchains = use_extension("@tar.bzl//tar:extensions.bzl", "toolchains")
498-
use_repo(bazel_lib_toolchains, "bsd_tar_toolchains")
499-
500-
register_toolchains("@bsd_tar_toolchains//:all")
501-
502498
########################################
503499
# from bazel/include/python.MODULE.bazel
504500
# rules_python and friends

bazel/include/oci.MODULE.bazel

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,3 @@ git_override(
2121
commit = "63ee63e15fae64f00b1c1ace1eb5cc99251b9e02",
2222
remote = "https://github.com/GoogleContainerTools/container-structure-test.git",
2323
)
24-
25-
# Used for testing container layers
26-
bazel_dep(name = "tar.bzl", version = "0.5.5")
27-
28-
bazel_lib_toolchains = use_extension("@tar.bzl//tar:extensions.bzl", "toolchains")
29-
use_repo(bazel_lib_toolchains, "bsd_tar_toolchains")
30-
31-
register_toolchains("@bsd_tar_toolchains//:all")

e2e/MODULE.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
"Bazel dependencies"
22

3+
bazel_dep(name = "tar.bzl", version = "0.5.5")
4+
5+
bazel_lib_toolchains = use_extension("@tar.bzl//tar:extensions.bzl", "toolchains", dev_dependency = True)
6+
use_repo(bazel_lib_toolchains, "bsd_tar_toolchains")
7+
38
include("//bazel/include:e2e.MODULE.bazel")
49

510
include("//bazel/include:oci.MODULE.bazel")

uv/private/hub/repository.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ alias(
214214
content = [
215215
"""load("//:defs.bzl", "compatible_with")""",
216216
]
217-
for entrypoint_name, entrypoint_coordinate in entrypoints.get(name, {}).items():
217+
for entrypoint_name, _entrypoint_coordinate in entrypoints.get(name, {}).items():
218218
select_spec = {
219219
"//venv:{}".format(it): "@venv__{0}__{1}//{2}/entrypoints:{3}".format(repository_ctx.attr.hub_name, it, name, entrypoint_name)
220220
for it in spec

0 commit comments

Comments
 (0)