diff --git a/bazel/rust/defs.bzl b/bazel/rust/defs.bzl index d5bc4697..7a120e29 100644 --- a/bazel/rust/defs.bzl +++ b/bazel/rust/defs.bzl @@ -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") @@ -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)}, @@ -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)}, diff --git a/docs/uv.md b/docs/uv.md index c778188d..0279dd81 100644 --- a/docs/uv.md +++ b/docs/uv.md @@ -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", diff --git a/e2e/cases/interpreter-version-541/BUILD.bazel b/e2e/cases/interpreter-version-541/BUILD.bazel index cc647601..5d53cb5d 100644 --- a/e2e/cases/interpreter-version-541/BUILD.bazel +++ b/e2e/cases/interpreter-version-541/BUILD.bazel @@ -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") [ [ diff --git a/e2e/cases/uv-deps-650/crossbuild/BUILD.bazel b/e2e/cases/uv-deps-650/crossbuild/BUILD.bazel index 03cab11a..7fb83e49 100644 --- a/e2e/cases/uv-deps-650/crossbuild/BUILD.bazel +++ b/e2e/cases/uv-deps-650/crossbuild/BUILD.bazel @@ -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( diff --git a/examples/py_binary/BUILD.bazel b/examples/py_binary/BUILD.bazel index 5a38499c..7c225236 100644 --- a/examples/py_binary/BUILD.bazel +++ b/examples/py_binary/BUILD.bazel @@ -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( diff --git a/examples/py_venv/BUILD.bazel b/examples/py_venv/BUILD.bazel index e28b5b7c..0830c37e 100644 --- a/examples/py_venv/BUILD.bazel +++ b/examples/py_venv/BUILD.bazel @@ -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") diff --git a/py/BUILD.bazel b/py/BUILD.bazel index d12225d2..614a55e9 100644 --- a/py/BUILD.bazel +++ b/py/BUILD.bazel @@ -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 @@ -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", ], ) diff --git a/py/private/BUILD.bazel b/py/private/BUILD.bazel index eb36e61b..fe16d666 100644 --- a/py/private/BUILD.bazel +++ b/py/private/BUILD.bazel @@ -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", ], ) @@ -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", ], ) diff --git a/py/private/py_binary.bzl b/py/private/py_binary.bzl index cfc0ea3f..c645d19a 100644 --- a/py/private/py_binary.bzl +++ b/py/private/py_binary.bzl @@ -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") diff --git a/py/private/py_image_layer.bzl b/py/private/py_image_layer.bzl index 92eac526..fa835074 100644 --- a/py/private/py_image_layer.bzl +++ b/py/private/py_image_layer.bzl @@ -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" diff --git a/py/private/py_venv/BUILD.bazel b/py/private/py_venv/BUILD.bazel index d2e5576a..4c2fc43c 100644 --- a/py/private/py_venv/BUILD.bazel +++ b/py/private/py_venv/BUILD.bazel @@ -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", ], ) diff --git a/py/private/py_venv/py_venv.bzl b/py/private/py_venv/py_venv.bzl index 0f3788da..e604e8a7 100644 --- a/py/private/py_venv/py_venv.bzl +++ b/py/private/py_venv/py_venv.bzl @@ -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") diff --git a/py/private/release/BUILD.bazel b/py/private/release/BUILD.bazel index a1013eb3..96ddde54 100644 --- a/py/private/release/BUILD.bazel +++ b/py/private/release/BUILD.bazel @@ -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__"], diff --git a/py/tests/external-deps/BUILD.bazel b/py/tests/external-deps/BUILD.bazel index b2816fc2..ef9321c6 100644 --- a/py/tests/external-deps/BUILD.bazel +++ b/py/tests/external-deps/BUILD.bazel @@ -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") diff --git a/py/tests/external-deps/sibling-package/BUILD.bazel b/py/tests/external-deps/sibling-package/BUILD.bazel index a25e0486..cf448731 100644 --- a/py/tests/external-deps/sibling-package/BUILD.bazel +++ b/py/tests/external-deps/sibling-package/BUILD.bazel @@ -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( diff --git a/py/tests/py-binary/BUILD.bazel b/py/tests/py-binary/BUILD.bazel index 5d8381ba..4104ef0c 100644 --- a/py/tests/py-binary/BUILD.bazel +++ b/py/tests/py-binary/BUILD.bazel @@ -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") diff --git a/py/tests/py-pex-binary/BUILD.bazel b/py/tests/py-pex-binary/BUILD.bazel index b7d7c5ad..b0cb3b62 100644 --- a/py/tests/py-pex-binary/BUILD.bazel +++ b/py/tests/py-pex-binary/BUILD.bazel @@ -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. diff --git a/py/tests/py_image_layer/BUILD.bazel b/py/tests/py_image_layer/BUILD.bazel index 18c28b00..eb1dac48 100644 --- a/py/tests/py_image_layer/BUILD.bazel +++ b/py/tests/py_image_layer/BUILD.bazel @@ -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") diff --git a/py/tests/py_image_layer/asserts.bzl b/py/tests/py_image_layer/asserts.bzl index 4062cfab..2fb4b5b1 100644 --- a/py/tests/py_image_layer/asserts.bzl +++ b/py/tests/py_image_layer/asserts.bzl @@ -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): diff --git a/py/tests/py_venv_image_layer/BUILD.bazel b/py/tests/py_venv_image_layer/BUILD.bazel index d4db5eac..cd799db4 100644 --- a/py/tests/py_venv_image_layer/BUILD.bazel +++ b/py/tests/py_venv_image_layer/BUILD.bazel @@ -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") diff --git a/uv/private/BUILD.bazel b/uv/private/BUILD.bazel index d957e823..2b589f34 100644 --- a/uv/private/BUILD.bazel +++ b/uv/private/BUILD.bazel @@ -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( diff --git a/uv/private/manifest/defs.bzl b/uv/private/manifest/defs.bzl index ad3f4bfc..e085e512 100644 --- a/uv/private/manifest/defs.bzl +++ b/uv/private/manifest/defs.bzl @@ -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): diff --git a/uv/private/sha1.bzl b/uv/private/sha1.bzl index 1c1e4269..4193ae5e 100644 --- a/uv/private/sha1.bzl +++ b/uv/private/sha1.bzl @@ -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.