From 00d352b9d3b8155a64a4a333366aeb44768a1181 Mon Sep 17 00:00:00 2001 From: Richard Levasseur Date: Thu, 7 Nov 2024 16:17:18 -0800 Subject: [PATCH] chore: cleanup and fix some bzl_library deps in //python/private (#2381) After the move out of `python/private/common`, some dep entries didn't get renamed to use the idiomatic local naming (`:foo`) instead of absolute names. Along the way, add a missing dep entry to py_runtime_rule on skylib's common_settings. --- python/private/BUILD.bazel | 49 +++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/python/private/BUILD.bazel b/python/private/BUILD.bazel index 7399b104e0..bbee4def7c 100644 --- a/python/private/BUILD.bazel +++ b/python/private/BUILD.bazel @@ -56,13 +56,13 @@ bzl_library( srcs = ["attributes.bzl"], deps = [ ":common_bzl", + ":enum_bzl", + ":flags_bzl", + ":py_info_bzl", ":py_internal_bzl", + ":reexports_bzl", + ":rules_cc_srcs_bzl", ":semantics_bzl", - "//python/private:enum_bzl", - "//python/private:flags_bzl", - "//python/private:py_info_bzl", - "//python/private:reexports_bzl", - "//python/private:rules_cc_srcs_bzl", "@bazel_skylib//rules:common_settings", ], ) @@ -109,10 +109,10 @@ bzl_library( deps = [ ":attributes_bzl", ":common_bzl", + ":py_cc_link_params_info_bzl", ":py_internal_bzl", - "//python/private:py_cc_link_params_info_bzl", - "//python/private:py_interpreter_program_bzl", - "//python/private:toolchain_types_bzl", + ":py_interpreter_program_bzl", + ":toolchain_types_bzl", "@bazel_skylib//lib:paths", ], ) @@ -122,11 +122,11 @@ bzl_library( srcs = ["common.bzl"], deps = [ ":cc_helper_bzl", + ":py_info_bzl", ":py_internal_bzl", + ":reexports_bzl", + ":rules_cc_srcs_bzl", ":semantics_bzl", - "//python/private:py_info_bzl", - "//python/private:reexports_bzl", - "//python/private:rules_cc_srcs_bzl", ], ) @@ -350,8 +350,8 @@ bzl_library( ":common_bzl", ":py_executable_bzl", ":py_internal_bzl", + ":py_runtime_info_bzl", ":semantics_bzl", - "//python/private:py_runtime_info_bzl", ], ) @@ -362,14 +362,14 @@ bzl_library( ":attributes_bzl", ":cc_helper_bzl", ":common_bzl", + ":flags_bzl", + ":py_cc_link_params_info_bzl", + ":py_executable_info_bzl", + ":py_info_bzl", ":py_internal_bzl", - "//python/private:flags_bzl", - "//python/private:py_cc_link_params_info_bzl", - "//python/private:py_executable_info_bzl", - "//python/private:py_info_bzl", - "//python/private:py_runtime_info_bzl", - "//python/private:rules_cc_srcs_bzl", - "//python/private:toolchain_types_bzl", + ":py_runtime_info_bzl", + ":rules_cc_srcs_bzl", + ":toolchain_types_bzl", "@bazel_skylib//lib:dicts", "@bazel_skylib//lib:structs", "@bazel_skylib//rules:common_settings", @@ -410,10 +410,10 @@ bzl_library( deps = [ ":attributes_bzl", ":common_bzl", + ":flags_bzl", + ":py_cc_link_params_info_bzl", ":py_internal_bzl", - "//python/private:flags_bzl", - "//python/private:py_cc_link_params_info_bzl", - "//python/private:toolchain_types_bzl", + ":toolchain_types_bzl", "@bazel_skylib//lib:dicts", "@bazel_skylib//rules:common_settings", ], @@ -473,13 +473,14 @@ bzl_library( name = "py_runtime_rule_bzl", srcs = ["py_runtime_rule.bzl"], deps = [ + ":attributes_bzl", + ":py_internal_bzl", ":py_runtime_info_bzl", ":reexports_bzl", ":util_bzl", - "//python/private:attributes_bzl", - "//python/private:py_internal_bzl", "@bazel_skylib//lib:dicts", "@bazel_skylib//lib:paths", + "@bazel_skylib//rules:common_settings", ], )