Skip to content

Remove some usage of aspect_bazel_lib #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dzbarsky wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove some usage of aspect_bazel_lib #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bazel/rust/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Rust rule defaults"""

load("@aspect_bazel_lib//lib:expand_template.bzl", _expand_template = "expand_template")
load("@bazel_lib//lib:expand_template.bzl", "expand_template")
load("@rules_rust//rust:defs.bzl", _rust_binary = "rust_binary", _rust_library = "rust_library", _rust_proc_macro = "rust_proc_macro", _rust_test = "rust_test")
load("@with_cfg.bzl", "with_cfg")

Expand Down Expand Up @@ -37,7 +37,7 @@ def rust_binary(name, rustc_env_files = [], version_key = "", crate_features = [

if version_key != None:
rustc_env_file = "{}_rustc_env_file".format(name)
_expand_template(
expand_template(
name = "{}_env_file".format(name),
out = rustc_env_file,
stamp_substitutions = {"0.0.0-DEV": "{{%s}}" % (version_key)},
Expand Down Expand Up @@ -80,7 +80,7 @@ def rust_library(name, rustc_env_files = [], version_key = "", crate_features =
stamp = 0
if version_key != None:
rustc_env_file = "{}_rustc_env_file".format(name)
_expand_template(
expand_template(
name = "{}_env_file".format(name),
out = rustc_env_file,
stamp_substitutions = {"0.0.0-DEV": "{{%s}}" % (version_key)},
Expand Down
2 changes: 1 addition & 1 deletion docs/uv.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ Crossbuilds can be accomplished simply by setting the `--platform` flag, or
using platform transitions.

```
load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
load("@aspect_rules_py//py/unstable:defs.bzl", "py_venv_binary")
load("@aspect_rules_py//py:defs.bzl", "py_image_layer")
load("@bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")

platform(
name = "arm64_linux",
Expand Down
2 changes: 1 addition & 1 deletion e2e/cases/interpreter-version-541/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
load("@aspect_rules_py//py:defs.bzl", "py_test")
load("@aspect_rules_py//py/unstable:defs.bzl", "py_venv_test")
load("@bazel_lib//lib:expand_template.bzl", "expand_template")

[
[
Expand Down
2 changes: 1 addition & 1 deletion e2e/cases/uv-deps-650/crossbuild/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
load("@aspect_rules_py//py:defs.bzl", "py_image_layer")
load("@aspect_rules_py//py/tests/py_image_layer:asserts.bzl", "assert_tar_listing")
load("@aspect_rules_py//py/unstable:defs.bzl", "py_venv_binary")
load("@bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index")

platform(
Expand Down
2 changes: 1 addition & 1 deletion examples/py_binary/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
load("@bazel_lib//lib:expand_template.bzl", "expand_template")
load("//py:defs.bzl", "py_binary")

expand_template(
Expand Down
4 changes: 2 additions & 2 deletions examples/py_venv/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
load("@bazel_lib//lib:expand_template.bzl", "expand_template")
load("@bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load")
load("//py:defs.bzl", "py_image_layer")
load("//py/unstable:defs.bzl", "py_venv", "py_venv_binary")
Expand Down
4 changes: 2 additions & 2 deletions py/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@aspect_bazel_lib//:bzl_library.bzl", "bzl_library")
load("@bazel_lib//:bzl_library.bzl", "bzl_library")

# For Bazel 6.x compatibility, since
# PyRuntimeInfo shipped only with Bazel 7
Expand Down Expand Up @@ -35,7 +35,7 @@ bzl_library(
"//py/private:py_wheel",
"//py/private:virtual",
"//py/private/py_venv",
"@aspect_bazel_lib//lib:utils",
"@bazel_lib//lib:utils",
],
)

Expand Down
6 changes: 3 additions & 3 deletions py/private/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ bzl_library(
srcs = ["py_image_layer.bzl"],
deps = [
"@aspect_bazel_lib//lib:tar",
"@aspect_bazel_lib//lib:transitions",
"@bazel_lib//lib:transitions",
],
)

Expand All @@ -24,8 +24,8 @@ bzl_library(
srcs = ["py_binary.bzl"],
deps = [
":py_library",
"@aspect_bazel_lib//lib:expand_make_vars",
"@aspect_bazel_lib//lib:paths",
"@bazel_lib//lib:expand_make_vars",
"@bazel_lib//lib:paths",
],
)

Expand Down
4 changes: 2 additions & 2 deletions py/private/py_binary.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Implementation for the py_binary and py_test rules."""

load("@aspect_bazel_lib//lib:expand_make_vars.bzl", "expand_locations", "expand_variables")
load("@aspect_bazel_lib//lib:paths.bzl", "BASH_RLOCATION_FUNCTION", "to_rlocation_path")
load("@bazel_lib//lib:expand_make_vars.bzl", "expand_locations", "expand_variables")
load("@bazel_lib//lib:paths.bzl", "BASH_RLOCATION_FUNCTION", "to_rlocation_path")
load("@rules_python//python:defs.bzl", "PyInfo")
load("//py/private:py_library.bzl", _py_library = "py_library_utils")
load("//py/private:py_semantics.bzl", _py_semantics = "semantics")
Expand Down
2 changes: 1 addition & 1 deletion py/private/py_image_layer.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ oci_image(
"""

load("@aspect_bazel_lib//lib:tar.bzl", "mtree_mutate", "mtree_spec", "tar")
load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
load("@bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")

default_layer_groups = {
# match *only* external repositories that begins with the string "python"
Expand Down
4 changes: 2 additions & 2 deletions py/private/py_venv/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ bzl_library(
"//py/private:py_semantics",
"//py/private:transitions",
"//py/private/toolchain:types",
"@aspect_bazel_lib//lib:expand_make_vars",
"@aspect_bazel_lib//lib:paths",
"@bazel_lib//lib:expand_make_vars",
"@bazel_lib//lib:paths",
],
)

Expand Down
4 changes: 2 additions & 2 deletions py/private/py_venv/py_venv.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Implementation for the py_binary and py_test rules."""

load("@aspect_bazel_lib//lib:expand_make_vars.bzl", "expand_locations", "expand_variables")
load("@aspect_bazel_lib//lib:paths.bzl", "BASH_RLOCATION_FUNCTION", "to_rlocation_path")
load("@bazel_lib//lib:expand_make_vars.bzl", "expand_locations", "expand_variables")
load("@bazel_lib//lib:paths.bzl", "BASH_RLOCATION_FUNCTION", "to_rlocation_path")
load("//py/private:py_library.bzl", _py_library = "py_library_utils")
load("//py/private:py_semantics.bzl", _py_semantics = "semantics")
load("//py/private:transitions.bzl", "python_version_transition")
Expand Down
2 changes: 1 addition & 1 deletion py/private/release/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@aspect_bazel_lib//:bzl_library.bzl", "bzl_library")
load("@bazel_lib//:bzl_library.bzl", "bzl_library")

package(
default_visibility = ["//py:__subpackages__"],
Expand Down
2 changes: 1 addition & 1 deletion py/tests/external-deps/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
load("@bazel_lib//lib:write_source_files.bzl", "write_source_files")
load("//py:defs.bzl", "py_binary", "py_library", "py_test")
load("//py/tests/external-deps/custom-macro:macro.bzl", "click_cli_binary")

Expand Down
2 changes: 1 addition & 1 deletion py/tests/external-deps/sibling-package/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
load("@bazel_lib//lib:write_source_files.bzl", "write_source_files")
load("//py/tests/external-deps/custom-macro:macro.bzl", "click_cli_binary")

click_cli_binary(
Expand Down
4 changes: 2 additions & 2 deletions py/tests/py-binary/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@aspect_bazel_lib//lib:run_binary.bzl", "run_binary")
load("@aspect_bazel_lib//lib:testing.bzl", "assert_contains")
load("@bazel_lib//lib:run_binary.bzl", "run_binary")
load("@bazel_lib//lib:testing.bzl", "assert_contains")
load("@pypi//:requirements.bzl", "requirement")
load("//py:defs.bzl", "py_binary", "py_test")

Expand Down
2 changes: 1 addition & 1 deletion py/tests/py-pex-binary/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@aspect_bazel_lib//lib:testing.bzl", "assert_contains")
load("@bazel_lib//lib:testing.bzl", "assert_contains")
load("//py:defs.bzl", "py_binary", "py_pex_binary")

# Test that both single-file modules (six) and multi-file modules (cowsay) work with py_pex_binary.
Expand Down
2 changes: 1 addition & 1 deletion py/tests/py_image_layer/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
load("@bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
load("@container_structure_test//:defs.bzl", "container_structure_test")
load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load")
load("//py:defs.bzl", "py_binary", "py_image_layer")
Expand Down
2 changes: 1 addition & 1 deletion py/tests/py_image_layer/asserts.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Test helper"""

load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_file")
load("@bazel_lib//lib:write_source_files.bzl", "write_source_file")

# buildifier: disable=function-docstring
def assert_tar_listing(name, actual, expected, **kwargs):
Expand Down
2 changes: 1 addition & 1 deletion py/tests/py_venv_image_layer/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
load("@bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
load("@container_structure_test//:defs.bzl", "container_structure_test")
load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load")
load("//py:defs.bzl", "py_image_layer")
Expand Down
2 changes: 1 addition & 1 deletion uv/private/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ bzl_library(
bzl_library(
name = "sha1",
srcs = ["sha1.bzl"],
deps = ["@aspect_bazel_lib//lib:strings"],
deps = ["@bazel_lib//lib:strings"],
)

bzl_library(
Expand Down
2 changes: 1 addition & 1 deletion uv/private/manifest/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
load("@bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
load("@rules_shell//shell:sh_binary.bzl", "sh_binary")

def _modules_mapping_impl(ctx):
Expand Down
2 changes: 1 addition & 1 deletion uv/private/sha1.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Sha1sum implemented in pure Starlark for portability.
Certainly not for efficiency good lord.
"""

load("@aspect_bazel_lib//lib:strings.bzl", "ord")
load("@bazel_lib//lib:strings.bzl", "ord")

def rotl32(x, n):
"""Rot[ate] L[eft] for 32bi wide.
Expand Down
Loading