Merge branch 'main' of https://github.com/bazel-contrib/rules_python into fix.site.packages.overlap

Author: rickeylev

python/BUILD.bazel

@@ -56,6 +56,7 @@ filegroup(
 bzl_library(
     name = "current_py_toolchain_bzl",
     srcs = ["current_py_toolchain.bzl"],
+    deps = ["//python/private:toolchain_types_bzl"],
 )
 
 bzl_library(
@@ -91,11 +92,9 @@ bzl_library(
     deps = [
         ":py_binary_bzl",
         "//python/private:bzlmod_enabled_bzl",
-        "//python/private:py_package.bzl",
+        "//python/private:py_package_bzl",
         "//python/private:py_wheel_bzl",
-        "//python/private:stamp_bzl",
         "//python/private:util_bzl",
-        "//python/private:version.bzl",
         "@bazel_skylib//rules:native_binary",
     ],
 )
@@ -215,7 +214,6 @@ bzl_library(
     deps = [
         "//python/private:py_runtime_info_bzl",
         "//python/private:reexports_bzl",
-        "//python/private:util_bzl",
         "@rules_python_internal//:rules_python_config_bzl",
     ],
 )

python/extensions/BUILD.bazel

@@ -46,5 +46,6 @@ bzl_library(
     visibility = ["//:__subpackages__"],
     deps = [
         "//python/private:internal_config_repo_bzl",
+        "//python/private/pypi:deps_bzl",
     ],
 )

python/private/BUILD.bazel

@@ -66,6 +66,7 @@ bzl_library(
     deps = [
         ":attr_builders_bzl",
         ":common_bzl",
+        ":common_labels_bzl",
         ":enum_bzl",
         ":flags_bzl",
         ":py_info_bzl",
@@ -356,6 +357,7 @@ bzl_library(
     name = "py_cc_toolchain_rule_bzl",
     srcs = ["py_cc_toolchain_rule.bzl"],
     deps = [
+        ":common_labels.bzl",
         ":py_cc_toolchain_info_bzl",
         ":rules_cc_srcs_bzl",
         ":util_bzl",
@@ -390,6 +392,7 @@ bzl_library(
     srcs = ["py_exec_tools_toolchain.bzl"],
     deps = [
         ":common_bzl",
+        ":common_labels_bzl",
         ":py_exec_tools_info_bzl",
         ":sentinel_bzl",
         ":toolchain_types_bzl",
@@ -405,6 +408,7 @@ bzl_library(
         ":attributes_bzl",
         ":cc_helper_bzl",
         ":common_bzl",
+        ":common_labels_bzl",
         ":flags_bzl",
         ":precompile_bzl",
         ":py_cc_link_params_info_bzl",
@@ -457,6 +461,7 @@ bzl_library(
     deps = [
         ":attributes_bzl",
         ":common_bzl",
+        ":common_labels_bzl",
         ":flags_bzl",
         ":normalize_name_bzl",
         ":precompile_bzl",
@@ -481,6 +486,7 @@ bzl_library(
     name = "py_library_rule_bzl",
     srcs = ["py_library_rule.bzl"],
     deps = [
+        ":common_labels_bzl",
         ":py_library_bzl",
     ],
 )
@@ -524,6 +530,7 @@ bzl_library(
     srcs = ["py_runtime_rule.bzl"],
     deps = [
         ":attributes_bzl",
+        ":common_labels_bzl",
         ":flags_bzl",
         ":py_internal_bzl",
         ":py_runtime_info_bzl",
@@ -547,6 +554,7 @@ bzl_library(
     name = "py_runtime_pair_rule_bzl",
     srcs = ["py_runtime_pair_rule.bzl"],
     deps = [
+        ":common_labels_bzl",
         "//python:py_runtime_bzl",
         "//python:py_runtime_info_bzl",
         "@bazel_skylib//rules:common_settings",
@@ -593,6 +601,7 @@ bzl_library(
         ":py_package_bzl",
         ":stamp_bzl",
         ":transition_labels_bzl",
+        ":version_bzl",
     ],
 )
 
@@ -663,7 +672,7 @@ bzl_library(
     name = "transition_labels_bzl",
     srcs = ["transition_labels.bzl"],
     deps = [
-        "common_labels_bzl",
+        ":common_labels_bzl",
         "@bazel_skylib//lib:collections",
         "@rules_python_internal//:extra_transition_settings_bzl",
     ],

python/private/attributes.bzl

@@ -17,6 +17,7 @@ load("@bazel_skylib//lib:dicts.bzl", "dicts")
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(":attr_builders.bzl", "attrb")
+load(":common_labels.bzl", "labels")
 load(":enum.bzl", "enum")
 load(":flags.bzl", "PrecompileFlag", "PrecompileSourceRetentionFlag")
 load(":py_info.bzl", "PyInfo")
@@ -370,11 +371,11 @@ files that may be needed at run time belong in `data`.
             doc = "Defunct, unused, does nothing.",
         ),
         "_precompile_flag": lambda: attrb.Label(
-            default = "//python/config_settings:precompile",
+            default = labels.PRECOMPILE,
             providers = [BuildSettingInfo],
         ),
         "_precompile_source_retention_flag": lambda: attrb.Label(
-            default = "//python/config_settings:precompile_source_retention",
+            default = labels.PRECOMPILE_SOURCE_RETENTION,
             providers = [BuildSettingInfo],
         ),
         # Force enabling auto exec groups, see

python/private/common_labels.bzl

@@ -9,13 +9,15 @@ labels = struct(
     BOOTSTRAP_IMPL = str(Label("//python/config_settings:bootstrap_impl")),
     EXEC_TOOLS_TOOLCHAIN = str(Label("//python/config_settings:exec_tools_toolchain")),
     PIP_ENV_MARKER_CONFIG = str(Label("//python/config_settings:pip_env_marker_config")),
-    PIP_WHL_MUSLC_VERSION = str(Label("//python/config_settings:pip_whl_muslc_version")),
+    NONE = str(Label("//python:none")),
     PIP_WHL = str(Label("//python/config_settings:pip_whl")),
     PIP_WHL_GLIBC_VERSION = str(Label("//python/config_settings:pip_whl_glibc_version")),
+    PIP_WHL_MUSLC_VERSION = str(Label("//python/config_settings:pip_whl_muslc_version")),
     PIP_WHL_OSX_ARCH = str(Label("//python/config_settings:pip_whl_osx_arch")),
     PIP_WHL_OSX_VERSION = str(Label("//python/config_settings:pip_whl_osx_version")),
     PRECOMPILE = str(Label("//python/config_settings:precompile")),
     PRECOMPILE_SOURCE_RETENTION = str(Label("//python/config_settings:precompile_source_retention")),
+    PYC_COLLECTION = str(Label("//python/config_settings:pyc_collection")),
     PYTHON_SRC = str(Label("//python/bin:python_src")),
     PYTHON_VERSION = str(Label("//python/config_settings:python_version")),
     PYTHON_VERSION_MAJOR_MINOR = str(Label("//python/config_settings:python_version_major_minor")),
@@ -24,4 +26,5 @@ labels = struct(
     REPL_DEP = str(Label("//python/bin:repl_dep")),
     VENVS_SITE_PACKAGES = str(Label("//python/config_settings:venvs_site_packages")),
     VENVS_USE_DECLARE_SYMLINK = str(Label("//python/config_settings:venvs_use_declare_symlink")),
+    VISIBLE_FOR_TESTING = str(Label("//python/private:visible_for_testing")),
 )

python/private/py_cc_toolchain_rule.bzl

@@ -20,6 +20,7 @@ https://github.com/bazel-contrib/rules_python/issues/824 is considered done.
 
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
+load(":common_labels.bzl", "labels")
 load(":py_cc_toolchain_info.bzl", "PyCcToolchainInfo")
 
 def _py_cc_toolchain_impl(ctx):
@@ -70,7 +71,7 @@ py_cc_toolchain = rule(
             mandatory = True,
         ),
         "_visible_for_testing": attr.label(
-            default = "//python/private:visible_for_testing",
+            default = labels.VISIBLE_FOR_TESTING,
         ),
     },
     doc = """\

python/private/py_exec_tools_toolchain.bzl

@@ -16,6 +16,7 @@
 
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
+load(":common_labels.bzl", "labels")
 load(":py_exec_tools_info.bzl", "PyExecToolsInfo")
 load(":sentinel.bzl", "SentinelInfo")
 load(":toolchain_types.bzl", "TARGET_TOOLCHAIN_TYPE")
@@ -89,7 +90,7 @@ so that the toolchain `py_runtime` field can be correctly forwarded.
             doc = "See {obj}`PyExecToolsInfo.precompiler`",
         ),
         "_visible_for_testing": attr.label(
-            default = "//python/private:visible_for_testing",
+            default = labels.VISIBLE_FOR_TESTING,
         ),
     },
 )

python/private/py_executable.bzl

@@ -52,6 +52,7 @@ load(
     "runfiles_root_path",
     "target_platform_has_any_constraint",
 )
+load(":common_labels.bzl", "labels")
 load(":flags.bzl", "BootstrapImplFlag", "VenvsUseDeclareSymlinkFlag")
 load(":precompile.bzl", "maybe_precompile")
 load(":py_cc_link_params_info.bzl", "PyCcLinkParamsInfo")
@@ -61,19 +62,13 @@ load(":py_internal.bzl", "py_internal")
 load(":py_runtime_info.bzl", "DEFAULT_STUB_SHEBANG", "PyRuntimeInfo")
 load(":reexports.bzl", "BuiltinPyInfo", "BuiltinPyRuntimeInfo")
 load(":rule_builders.bzl", "ruleb")
-load(
-    ":toolchain_types.bzl",
-    "EXEC_TOOLS_TOOLCHAIN_TYPE",
-    "TARGET_TOOLCHAIN_TYPE",
-    TOOLCHAIN_TYPE = "TARGET_TOOLCHAIN_TYPE",
-)
+load(":toolchain_types.bzl", "EXEC_TOOLS_TOOLCHAIN_TYPE", "TARGET_TOOLCHAIN_TYPE", TOOLCHAIN_TYPE = "TARGET_TOOLCHAIN_TYPE")
 load(":transition_labels.bzl", "TRANSITION_LABELS")
 load(":venv_runfiles.bzl", "create_venv_app_files")
 
 _py_builtins = py_internal
 _EXTERNAL_PATH_PREFIX = "external"
 _ZIP_RUNFILES_DIRECTORY_NAME = "runfiles"
-_PYTHON_VERSION_FLAG = str(Label("//python/config_settings:python_version"))
 
 # Non-Google-specific attributes for executables
 # These attributes are for rules that accept Python sources.
@@ -194,7 +189,7 @@ accepting arbitrary Python versions.
             default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
         ),
         "_bootstrap_impl_flag": lambda: attrb.Label(
-            default = "//python/config_settings:bootstrap_impl",
+            default = labels.BOOTSTRAP_IMPL,
             providers = [BuildSettingInfo],
         ),
         "_bootstrap_template": lambda: attrb.Label(
@@ -224,10 +219,10 @@ accepting arbitrary Python versions.
             default = TARGET_TOOLCHAIN_TYPE,
         ),
         "_python_version_flag": lambda: attrb.Label(
-            default = "//python/config_settings:python_version",
+            default = labels.PYTHON_VERSION,
         ),
         "_venvs_use_declare_symlink_flag": lambda: attrb.Label(
-            default = "//python/config_settings:venvs_use_declare_symlink",
+            default = labels.VENVS_USE_DECLARE_SYMLINK,
             providers = [BuildSettingInfo],
         ),
         "_windows_constraints": lambda: attrb.LabelList(
@@ -1793,7 +1788,7 @@ def _transition_executable_impl(settings, attr):
     apply_config_settings_attr(settings, attr)
 
     if attr.python_version and attr.python_version not in ("PY2", "PY3"):
-        settings[_PYTHON_VERSION_FLAG] = attr.python_version
+        settings[labels.PYTHON_VERSION] = attr.python_version
     return settings
 
 def create_executable_rule(*, attrs, **kwargs):
@@ -1844,8 +1839,8 @@ def create_executable_rule_builder(implementation, **kwargs):
         ],
         cfg = dict(
             implementation = _transition_executable_impl,
-            inputs = TRANSITION_LABELS + [_PYTHON_VERSION_FLAG],
-            outputs = TRANSITION_LABELS + [_PYTHON_VERSION_FLAG],
+            inputs = TRANSITION_LABELS + [labels.PYTHON_VERSION],
+            outputs = TRANSITION_LABELS + [labels.PYTHON_VERSION],
         ),
         **kwargs
     )

python/private/py_library.bzl

@@ -38,6 +38,7 @@ load(
     "filter_to_py_srcs",
     "get_imports",
 )
+load(":common_labels.bzl", "labels")
 load(":flags.bzl", "AddSrcsToRunfilesFlag", "PrecompileFlag", "VenvsSitePackages")
 load(":normalize_name.bzl", "normalize_name")
 load(":precompile.bzl", "maybe_precompile")
@@ -101,7 +102,7 @@ and that only one package version will be included.
 """,
         ),
         "_add_srcs_to_runfiles_flag": lambda: attrb.Label(
-            default = "//python/config_settings:add_srcs_to_runfiles",
+            default = labels.ADD_SRCS_TO_RUNFILES,
         ),
     },
 )

python/private/py_runtime_pair_rule.bzl

@@ -16,6 +16,7 @@
 
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 load("//python:py_runtime_info.bzl", "PyRuntimeInfo")
+load(":common_labels.bzl", "labels")
 load(":reexports.bzl", "BuiltinPyRuntimeInfo")
 load(":util.bzl", "IS_BAZEL_7_OR_HIGHER")
 
@@ -94,7 +95,7 @@ The runtime to use for Python 3 targets. Must have `python_version` set to
 """,
         ),
         "_visible_for_testing": attr.label(
-            default = "//python/private:visible_for_testing",
+            default = labels.VISIBLE_FOR_TESTING,
         ),
     },
     fragments = ["py"],