use rules_python_internal to get globals; fix a couple missed spots

rickeylev · rickeylev · commit 2393c5aa4000 · 2024-10-07T16:50:48.000-07:00
diff --git a/WORKSPACE b/WORKSPACE
@@ -21,9 +21,9 @@ load("//:internal_deps.bzl", "rules_python_internal_deps")
 
 rules_python_internal_deps()
 
-load("//python:repositories_deps.bzl", "py_repositories_deps")
-
-py_repositories_deps()
+##load("//python:repositories_deps.bzl", "py_repositories_deps")
+##
+##py_repositories_deps()
 
 load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
 
diff --git a/python/private/common/py_runtime_rule.bzl b/python/private/common/py_runtime_rule.bzl
@@ -132,7 +132,7 @@ def _py_runtime_impl(ctx):
             runfiles = runfiles,
         ),
     ]
-    if BuiltinPyRuntimeInfo != None:
+    if BuiltinPyRuntimeInfo != None and BuiltinPyRuntimeInfo != PyRuntimeInfo:
         # Return the builtin provider for better compatibility.
         # 1. There is a legacy code path in py_binary that
         #    checks for the provider when toolchains aren't used
diff --git a/python/private/internal_config_repo.bzl b/python/private/internal_config_repo.bzl
@@ -24,6 +24,9 @@ _ENABLE_PYSTAR_DEFAULT = "1"
 _CONFIG_TEMPLATE = """\
 config = struct(
   enable_pystar = {enable_pystar},
+  BuiltinPyInfo = getattr(getattr(native, "legacy_globals", None), "PyInfo", {builtin_py_info_symbol}),
+  BuiltinPyRuntimeInfo = getattr(getattr(native, "legacy_globals", None), "PyRuntimeInfo", {builtin_py_runtime_info_symbol}),
+  BuiltinPyCcLinkParamsProvider = getattr(getattr(native, "legacy_globals", None), "PyCcLinkParamsProvider", {builtin_py_cc_link_params_provider}),
 )
 """
 
@@ -65,8 +68,20 @@ def _internal_config_repo_impl(rctx):
     else:
         enable_pystar = False
 
+    if native.bazel_version.startswith("8."):
+        builtin_py_info_symbol = "None"
+        builtin_py_runtime_info_symbol = "None"
+        builtin_py_cc_link_params_provider = "None"
+    else:
+        builtin_py_info_symbol = "PyInfo"
+        builtin_py_runtime_info_symbol = "PyRuntimeInfo"
+        builtin_py_cc_link_params_provider = "PyCcLinkParamsProvider"
+
     rctx.file("rules_python_config.bzl", _CONFIG_TEMPLATE.format(
         enable_pystar = enable_pystar,
+        builtin_py_info_symbol = builtin_py_info_symbol,
+        builtin_py_runtime_info_symbol = builtin_py_runtime_info_symbol,
+        builtin_py_cc_link_params_provider = builtin_py_cc_link_params_provider,
     ))
 
     if enable_pystar:
diff --git a/python/private/py_info.bzl b/python/private/py_info.bzl
@@ -118,7 +118,7 @@ This field is currently unused in Bazel and may go away in the future.
 )
 
 # The "effective" PyInfo is what the canonical //python:py_info.bzl%PyInfo symbol refers to
-_EffectivePyInfo = PyInfo if config.enable_pystar or BuiltinPyInfo == None else BuiltinPyInfo
+_EffectivePyInfo = PyInfo if (config.enable_pystar or BuiltinPyInfo == None) else BuiltinPyInfo
 
 def PyInfoBuilder():
     # buildifier: disable=uninitialized
diff --git a/python/private/reexports.bzl b/python/private/reexports.bzl
@@ -30,13 +30,12 @@ inaccessible. So instead we access the builtin here and export it under a
 different name. Then we can load it from elsewhere.
 """
 
-load("@bazel_features//:features.bzl", "bazel_features")
+load("@rules_python_internal//:rules_python_config.bzl", "config")
 
-# Don't use underscore prefix, since that would make the symbol local to this
-# file only. Use a non-conventional name to emphasize that this is not a public
-# symbol.
+# NOTE: May be None (Bazel 8 autoloading rules_python)
 # buildifier: disable=name-conventions
-BuiltinPyInfo = getattr(bazel_features.globals, "PyInfo", None)
+BuiltinPyInfo = config.BuiltinPyInfo
 
+# NOTE: May be None (Bazel 8 autoloading rules_python)
 # buildifier: disable=name-conventions
-BuiltinPyRuntimeInfo = getattr(bazel_features.globals, "PyRuntimeInfo", None)
+BuiltinPyRuntimeInfo = config.BuiltinPyRuntimeInfo
diff --git a/python/py_cc_link_params_info.bzl b/python/py_cc_link_params_info.bzl
@@ -1,8 +1,11 @@
 """Public entry point for PyCcLinkParamsInfo."""
 
-load("@bazel_features//:features.bzl", "bazel_features")
 load("@rules_python_internal//:rules_python_config.bzl", "config")
 load("//python/private/common:providers.bzl", _starlark_PyCcLinkParamsProvider = "PyCcLinkParamsProvider")
 
-_PyCcLinkParamsProvider = getattr(bazel_features.globals, "PyCcLinkParamsProvider", None)  # buildifier: disable=name-conventions
-PyCcLinkParamsInfo = _starlark_PyCcLinkParamsProvider if config.enable_pystar or _PyCcLinkParamsProvider == None else PyCcLinkParamsProvider
+PyCcLinkParamsInfo = (
+    _starlark_PyCcLinkParamsProvider if (
+        config.enable_pystar or config.BuiltinPyCcLinkParamsProvider == None
+    ) else config.BuiltinPyCcLinkParamsProvider
+)
+print(native.legacy_globals)
diff --git a/tests/base_rules/py_executable_base_tests.bzl b/tests/base_rules/py_executable_base_tests.bzl
@@ -19,14 +19,13 @@ load("@rules_testing//lib:analysis_test.bzl", "analysis_test")
 load("@rules_testing//lib:truth.bzl", "matching")
 load("@rules_testing//lib:util.bzl", rt_util = "util")
 load("//python:py_executable_info.bzl", "PyExecutableInfo")
+load("//python/private:reexports.bzl", "BuiltinPyRuntimeInfo")
 load("//python/private:util.bzl", "IS_BAZEL_7_OR_HIGHER")  # buildifier: disable=bzl-visibility
 load("//tests/base_rules:base_tests.bzl", "create_base_tests")
 load("//tests/base_rules:util.bzl", "WINDOWS_ATTR", pt_util = "util")
 load("//tests/support:py_executable_info_subject.bzl", "PyExecutableInfoSubject")
 load("//tests/support:support.bzl", "CC_TOOLCHAIN", "CROSSTOOL_TOP", "LINUX_X86_64", "WINDOWS_X86_64")
 
-_BuiltinPyRuntimeInfo = PyRuntimeInfo
-
 _tests = []
 
 def _test_basic_windows(name, config):
@@ -359,9 +358,10 @@ def _test_py_runtime_info_provided_impl(env, target):
     # Make sure that the rules_python loaded symbol is provided.
     env.expect.that_target(target).has_provider(RulesPythonPyRuntimeInfo)
 
-    # For compatibility during the transition, the builtin PyRuntimeInfo should
-    # also be provided.
-    env.expect.that_target(target).has_provider(_BuiltinPyRuntimeInfo)
+    if BuiltinPyRuntimeInfo != None:
+        # For compatibility during the transition, the builtin PyRuntimeInfo should
+        # also be provided.
+        env.expect.that_target(target).has_provider(BuiltinPyRuntimeInfo)
 
 _tests.append(_test_py_runtime_info_provided)
 

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ def _py_runtime_impl(ctx):`
`132`	`132`	`runfiles = runfiles,`
`133`	`133`	`),`
`134`	`134`	`]`
`135`		`- if BuiltinPyRuntimeInfo != None:`
	`135`	`+ if BuiltinPyRuntimeInfo != None and BuiltinPyRuntimeInfo != PyRuntimeInfo:`
`136`	`136`	`# Return the builtin provider for better compatibility.`
`137`	`137`	`# 1. There is a legacy code path in py_binary that`
`138`	`138`	`# checks for the provider when toolchains aren't used`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ This field is currently unused in Bazel and may go away in the future.`
`118`	`118`	`)`
`119`	`119`
`120`	`120`	`# The "effective" PyInfo is what the canonical //python:py_info.bzl%PyInfo symbol refers to`
`121`		`-_EffectivePyInfo = PyInfo if config.enable_pystar or BuiltinPyInfo == None else BuiltinPyInfo`
	`121`	`+_EffectivePyInfo = PyInfo if (config.enable_pystar or BuiltinPyInfo == None) else BuiltinPyInfo`
`122`	`122`
`123`	`123`	`def PyInfoBuilder():`
`124`	`124`	`# buildifier: disable=uninitialized`