internal(pystar): make starlark impl (mostly) loadable (#1422)

This just makes the files able to get passed the loading stage under
Bazel 7+.

This mostly involves fixing load statements, but also exposed a couple
places where
py_internal needs some small changes.

* Also renames files to better distinguish rule vs macro vs
Bazel-specific. This makes it easier to patch them within Google and
more clear about which file is doing what.

Work towards #1069

Author: rickeylev

python/private/common/BUILD.bazel

@@ -0,0 +1,13 @@
+# Copyright 2023 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

python/private/common/attributes.bzl

@@ -13,18 +13,20 @@
 # limitations under the License.
 """Attributes for Python rules."""
 
-load(":common/cc/cc_info.bzl", _CcInfo = "CcInfo")
-load(":common/python/common.bzl", "union_attrs")
-load(":common/python/providers.bzl", "PyInfo")
+load(":common.bzl", "union_attrs")
+load(":providers.bzl", "PyInfo")
+load(":py_internal.bzl", "py_internal")
 load(
-    ":common/python/semantics.bzl",
+    ":semantics.bzl",
     "DEPS_ATTR_ALLOW_RULES",
     "PLATFORMS_LOCATION",
     "SRCS_ATTR_ALLOW_FILES",
     "TOOLS_REPO",
 )
 
-PackageSpecificationInfo = _builtins.toplevel.PackageSpecificationInfo
+# TODO: Load CcInfo from rules_cc
+_CcInfo = CcInfo
+_PackageSpecificationInfo = py_internal.PackageSpecificationInfo
 
 _STAMP_VALUES = [-1, 0, 1]
 
@@ -89,7 +91,7 @@ NATIVE_RULES_ALLOWLIST_ATTRS = {
             fragment = "py",
             name = "native_rules_allowlist",
         ),
-        providers = [PackageSpecificationInfo],
+        providers = [_PackageSpecificationInfo],
     ),
 }
 

python/private/common/cc_helper.bzl

@@ -0,0 +1,23 @@
+# Copyright 2023 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""PYTHON RULE IMPLEMENTATION ONLY: Do not use outside of the rule implementations and their tests.
+
+Adapter for accessing Bazel's internal cc_helper.
+
+These may change at any time and are closely coupled to the rule implementation.
+"""
+
+load(":py_internal.bzl", "py_internal")
+
+cc_helper = py_internal.cc_helper

python/private/common/common.bzl

@@ -13,23 +13,21 @@
 # limitations under the License.
 """Various things common to Bazel and Google rule implementations."""
 
-load(":common/cc/cc_helper.bzl", "cc_helper")
+load(":cc_helper.bzl", "cc_helper")
+load(":providers.bzl", "PyInfo")
+load(":py_internal.bzl", "py_internal")
 load(
-    ":common/python/providers.bzl",
-    "PyInfo",
-)
-load(
-    ":common/python/semantics.bzl",
+    ":semantics.bzl",
     "NATIVE_RULES_MIGRATION_FIX_CMD",
     "NATIVE_RULES_MIGRATION_HELP_URL",
     "TOOLS_REPO",
 )
 
-_testing = _builtins.toplevel.testing
-_platform_common = _builtins.toplevel.platform_common
-_coverage_common = _builtins.toplevel.coverage_common
-_py_builtins = _builtins.internal.py_builtins
-PackageSpecificationInfo = _builtins.toplevel.PackageSpecificationInfo
+_testing = testing
+_platform_common = platform_common
+_coverage_common = coverage_common
+_py_builtins = py_internal
+PackageSpecificationInfo = py_internal.PackageSpecificationInfo
 
 TOOLCHAIN_TYPE = "@" + TOOLS_REPO + "//tools/python:toolchain_type"
 

python/private/common/common_bazel.bzl

@@ -13,13 +13,18 @@
 # limitations under the License.
 """Common functions that are specific to Bazel rule implementation"""
 
-load(":common/cc/cc_common.bzl", _cc_common = "cc_common")
-load(":common/cc/cc_info.bzl", _CcInfo = "CcInfo")
-load(":common/paths.bzl", "paths")
-load(":common/python/common.bzl", "is_bool")
-load(":common/python/providers.bzl", "PyCcLinkParamsProvider")
+load("@bazel_skylib//lib:paths.bzl", "paths")
+load(":common.bzl", "is_bool")
+load(":providers.bzl", "PyCcLinkParamsProvider")
+load(":py_internal.bzl", "py_internal")
 
-_py_builtins = _builtins.internal.py_builtins
+# TODO: Load cc_common from rules_cc
+_cc_common = cc_common
+
+# TODO: Load CcInfo from rules_cc
+_CcInfo = CcInfo
+
+_py_builtins = py_internal
 
 def collect_cc_info(ctx, extra_deps = []):
     """Collect C++ information from dependencies for Bazel.

python/private/common/providers.bzl

@@ -13,14 +13,13 @@
 # limitations under the License.
 """Providers for Python rules."""
 
-load(":common/python/semantics.bzl", "TOOLS_REPO")
+load(":semantics.bzl", "TOOLS_REPO")
 
-_CcInfo = _builtins.toplevel.CcInfo
+# TODO: load CcInfo from rules_cc
+_CcInfo = CcInfo
 
-# NOTE: This is copied to PyRuntimeInfo.java
 DEFAULT_STUB_SHEBANG = "#!/usr/bin/env python3"
 
-# NOTE: This is copied to PyRuntimeInfo.java
 DEFAULT_BOOTSTRAP_TEMPLATE = "@" + TOOLS_REPO + "//tools/python:python_bootstrap_template.txt"
 _PYTHON_VERSION_VALUES = ["PY2", "PY3"]
 

python/private/common/py_binary_macro.bzl …private/common/py_binary_macro_bazel.bzlpython/private/common/py_binary_macro.bzl renamed to python/private/common/py_binary_macro_bazel.bzl python/private/common/py_binary_macro.bzl renamed to python/private/common/py_binary_macro_bazel.bzl

@@ -13,8 +13,8 @@
 # limitations under the License.
 """Implementation of macro-half of py_binary rule."""
 
-load(":common/python/common_bazel.bzl", "convert_legacy_create_init_to_int")
-load(":common/python/py_binary_bazel.bzl", py_binary_rule = "py_binary")
+load(":common_bazel.bzl", "convert_legacy_create_init_to_int")
+load(":py_binary_rule_bazel.bzl", py_binary_rule = "py_binary")
 
 def py_binary(**kwargs):
     convert_legacy_create_init_to_int(kwargs)

python/private/common/py_binary_bazel.bzl …/private/common/py_binary_rule_bazel.bzlpython/private/common/py_binary_bazel.bzl renamed to python/private/common/py_binary_rule_bazel.bzl python/private/common/py_binary_bazel.bzl renamed to python/private/common/py_binary_rule_bazel.bzl

@@ -13,13 +13,13 @@
 # limitations under the License.
 """Rule implementation of py_binary for Bazel."""
 
-load(":common/python/attributes.bzl", "AGNOSTIC_BINARY_ATTRS")
+load(":attributes.bzl", "AGNOSTIC_BINARY_ATTRS")
 load(
-    ":common/python/py_executable_bazel.bzl",
+    ":py_executable_bazel.bzl",
     "create_executable_rule",
     "py_executable_bazel_impl",
 )
-load(":common/python/semantics.bzl", "TOOLS_REPO")
+load(":semantics.bzl", "TOOLS_REPO")
 
 _PY_TEST_ATTRS = {
     "_collect_cc_coverage": attr.label(

python/private/common/py_executable.bzl

@@ -13,19 +13,18 @@
 # limitations under the License.
 """Common functionality between test/binary executables."""
 
-load(":common/cc/cc_common.bzl", _cc_common = "cc_common")
-load(":common/cc/cc_helper.bzl", "cc_helper")
 load(
-    ":common/python/attributes.bzl",
+    ":attributes.bzl",
     "AGNOSTIC_EXECUTABLE_ATTRS",
     "COMMON_ATTRS",
     "PY_SRCS_ATTRS",
     "SRCS_VERSION_ALL_VALUES",
     "create_srcs_attr",
     "create_srcs_version_attr",
 )
+load(":cc_helper.bzl", "cc_helper")
 load(
-    ":common/python/common.bzl",
+    ":common.bzl",
     "TOOLCHAIN_TYPE",
     "check_native_allowed",
     "collect_imports",
@@ -38,19 +37,23 @@ load(
     "union_attrs",
 )
 load(
-    ":common/python/providers.bzl",
+    ":providers.bzl",
     "PyCcLinkParamsProvider",
     "PyRuntimeInfo",
 )
+load(":py_internal.bzl", "py_internal")
 load(
-    ":common/python/semantics.bzl",
+    ":semantics.bzl",
     "ALLOWED_MAIN_EXTENSIONS",
     "BUILD_DATA_SYMLINK_PATH",
     "IS_BAZEL",
     "PY_RUNTIME_ATTR_NAME",
 )
 
-_py_builtins = _builtins.internal.py_builtins
+# TODO: Load cc_common from rules_cc
+_cc_common = cc_common
+
+_py_builtins = py_internal
 
 # Non-Google-specific attributes for executables
 # These attributes are for rules that accept Python sources.
@@ -677,9 +680,8 @@ def is_stamping_enabled(ctx, semantics):
 def _is_tool_config(ctx):
     # NOTE: The is_tool_configuration() function is only usable by builtins.
     # See https://github.com/bazelbuild/bazel/issues/14444 for the FR for
-    # a more public API. Outside of builtins, ctx.bin_dir.path can be
-    # checked for `/host/` or `-exec-`.
-    return ctx.configuration.is_tool_configuration()
+    # a more public API. Until that's available, py_internal to the rescue.
+    return py_internal.is_tool_configuration(ctx)
 
 def _create_providers(
         *,

python/private/common/py_executable_bazel.bzl

@@ -13,25 +13,26 @@
 # limitations under the License.
 """Implementation for Bazel Python executable."""
 
-load(":common/paths.bzl", "paths")
-load(":common/python/attributes_bazel.bzl", "IMPORTS_ATTRS")
+load("@bazel_skylib//lib:paths.bzl", "paths")
+load(":attributes_bazel.bzl", "IMPORTS_ATTRS")
 load(
-    ":common/python/common.bzl",
+    ":common.bzl",
     "create_binary_semantics_struct",
     "create_cc_details_struct",
     "create_executable_result_struct",
     "union_attrs",
 )
-load(":common/python/common_bazel.bzl", "collect_cc_info", "get_imports", "maybe_precompile")
-load(":common/python/providers.bzl", "DEFAULT_STUB_SHEBANG")
+load(":common_bazel.bzl", "collect_cc_info", "get_imports", "maybe_precompile")
+load(":providers.bzl", "DEFAULT_STUB_SHEBANG")
 load(
-    ":common/python/py_executable.bzl",
+    ":py_executable.bzl",
     "create_base_executable_rule",
     "py_executable_base_impl",
 )
-load(":common/python/semantics.bzl", "TOOLS_REPO")
+load(":py_internal.bzl", "py_internal")
+load(":semantics.bzl", "TOOLS_REPO")
 
-_py_builtins = _builtins.internal.py_builtins
+_py_builtins = py_internal
 _EXTERNAL_PATH_PREFIX = "external"
 _ZIP_RUNFILES_DIRECTORY_NAME = "runfiles"