revert the cleanup to debug the integration tests

Author: aignas

docs/BUILD.bazel

@@ -15,6 +15,7 @@
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@dev_pip//:requirements.bzl", "requirement")
 load("//python/private:bzlmod_enabled.bzl", "BZLMOD_ENABLED")  # buildifier: disable=bzl-visibility
+load("//python/private:util.bzl", "IS_BAZEL_7_OR_HIGHER")  # buildifier: disable=bzl-visibility
 load("//python/uv:lock.bzl", "lock")  # buildifier: disable=bzl-visibility
 load("//sphinxdocs:readthedocs.bzl", "readthedocs_install")
 load("//sphinxdocs:sphinx.bzl", "sphinx_build_binary", "sphinx_docs")
@@ -106,8 +107,6 @@ sphinx_stardocs(
         "//python/cc:py_cc_toolchain_bzl",
         "//python/cc:py_cc_toolchain_info_bzl",
         "//python/entry_points:py_console_script_binary_bzl",
-        "//python/extensions:pip_bzl",
-        "//python/extensions:python_bzl",
         "//python/local_toolchains:repos_bzl",
         "//python/private:attr_builders_bzl",
         "//python/private:builders_util_bzl",
@@ -128,7 +127,13 @@ sphinx_stardocs(
         "//python/uv:uv_bzl",
         "//python/uv:uv_toolchain_bzl",
         "//python/uv:uv_toolchain_info_bzl",
-    ],
+    ] + ([
+        # Bazel 6 + Stardoc isn't able to parse something about the python bzlmod extension
+        "//python/extensions:python_bzl",
+    ] if IS_BAZEL_7_OR_HIGHER else []) + ([
+        # This depends on @pythons_hub, which is only created under bzlmod,
+        "//python/extensions:pip_bzl",
+    ] if IS_BAZEL_7_OR_HIGHER and BZLMOD_ENABLED else []),
     prefix = "api/rules_python/",
     tags = ["docs"],
     target_compatible_with = _TARGET_COMPATIBLE_WITH,

examples/bzlmod/other_module/MODULE.bazel

@@ -5,10 +5,20 @@ module(
 # This module is using the same version of rules_python
 # that the parent module uses.
 bazel_dep(name = "rules_python", version = "")
-local_path_override(
-    module_name = "rules_python",
-    path = "../../..",
-)
+
+# The story behind this commented out override:
+# This override is necessary to generate/update the requirements file
+# for this module. This is because running it via the outer
+# module doesn't work -- the `requirements.update` target can't find
+# the correct file to update.
+# Running in the submodule itself works, but submodules using overrides
+# is considered an error until Bazel 6.3, which prevents the outer module
+# from depending on this module.
+# So until 6.3 and higher is the minimum, we leave this commented out.
+# local_path_override(
+#     module_name = "rules_python",
+#     path = "../../..",
+# )
 
 PYTHON_NAME_39 = "python_3_9"
 

python/BUILD.bazel

@@ -201,7 +201,11 @@ bzl_library(
 bzl_library(
     name = "py_runtime_pair_bzl",
     srcs = ["py_runtime_pair.bzl"],
-    deps = ["//python/private:py_runtime_pair_macro_bzl"],
+    deps = [
+        "//python/private:bazel_tools_bzl",
+        "//python/private:py_runtime_pair_macro_bzl",
+        "//python/private:util_bzl",
+    ],
 )
 
 bzl_library(

python/private/BUILD.bazel

@@ -71,6 +71,7 @@ bzl_library(
         ":enum_bzl",
         ":flags_bzl",
         ":py_info_bzl",
+        ":py_internal_bzl",
         ":reexports_bzl",
         ":rules_cc_srcs_bzl",
         "@bazel_skylib//rules:common_settings",
@@ -341,6 +342,7 @@ bzl_library(
     srcs = ["py_cc_link_params_info.bzl"],
     deps = [
         ":rules_cc_srcs_bzl",
+        ":util_bzl",
     ],
 )
 
@@ -438,6 +440,7 @@ bzl_library(
     deps = [
         ":builders_bzl",
         ":reexports_bzl",
+        ":util_bzl",
         "@rules_python_internal//:rules_python_config_bzl",
     ],
 )
@@ -503,6 +506,7 @@ bzl_library(
 bzl_library(
     name = "py_runtime_info_bzl",
     srcs = ["py_runtime_info.bzl"],
+    deps = [":util_bzl"],
 )
 
 bzl_library(

python/private/envsubst.bzl

@@ -22,7 +22,7 @@ def envsubst(template_string, varnames, getenv):
     listed in the `varnames` list in the environment defined by the
     `getenv` function. Typically called with `getenv = rctx.getenv`
     (if it is available) or `getenv = rctx.os.environ.get` (on e.g.
-    Bazel 7, which don't have `rctx.getenv` yet).
+    Bazel 6 or Bazel 7, which don't have `rctx.getenv` yet).
 
     Limitations: Unlike the shell, we don't support `${VARNAME}` and
     `${VARNAME:-default}` in the default expression for a different

python/private/internal_config_repo.bzl

@@ -23,6 +23,8 @@ load(":repo_utils.bzl", "repo_utils")
 
 _ENABLE_PIPSTAR_ENVVAR_NAME = "RULES_PYTHON_ENABLE_PIPSTAR"
 _ENABLE_PIPSTAR_DEFAULT = "0"
+_ENABLE_PYSTAR_ENVVAR_NAME = "RULES_PYTHON_ENABLE_PYSTAR"
+_ENABLE_PYSTAR_DEFAULT = "1"
 _ENABLE_DEPRECATION_WARNINGS_ENVVAR_NAME = "RULES_PYTHON_DEPRECATION_WARNINGS"
 _ENABLE_DEPRECATION_WARNINGS_DEFAULT = "0"
 
@@ -86,6 +88,15 @@ _TRANSITION_SETTINGS_DEBUG_TEMPLATE = """
 """
 
 def _internal_config_repo_impl(rctx):
+    pystar_requested = _bool_from_environ(rctx, _ENABLE_PYSTAR_ENVVAR_NAME, _ENABLE_PYSTAR_DEFAULT)
+
+    # Bazel 7+ (dev and later) has native.starlark_doc_extract, and thus the
+    # py_internal global, which are necessary for the pystar implementation.
+    if pystar_requested and hasattr(native, "starlark_doc_extract"):
+        enable_pystar = pystar_requested
+    else:
+        enable_pystar = False
+
     if not native.bazel_version or int(native.bazel_version.split(".")[0]) >= 8:
         builtin_py_info_symbol = "None"
         builtin_py_runtime_info_symbol = "None"
@@ -96,19 +107,33 @@ def _internal_config_repo_impl(rctx):
         builtin_py_cc_link_params_provider = "PyCcLinkParamsProvider"
 
     rctx.file("rules_python_config.bzl", _CONFIG_TEMPLATE.format(
-        enable_pystar = True,
+        enable_pystar = enable_pystar,
         enable_pipstar = _bool_from_environ(rctx, _ENABLE_PIPSTAR_ENVVAR_NAME, _ENABLE_PIPSTAR_DEFAULT),
         enable_deprecation_warnings = _bool_from_environ(rctx, _ENABLE_DEPRECATION_WARNINGS_ENVVAR_NAME, _ENABLE_DEPRECATION_WARNINGS_DEFAULT),
         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:
+        shim_content = _PY_INTERNAL_SHIM
+        py_internal_dep = '"@rules_python//tools/build_defs/python/private:py_internal_renamed_bzl"'
+    else:
+        shim_content = "py_internal_impl = None\n"
+        py_internal_dep = ""
+
+    # Bazel 5 doesn't support repository visibility, so just use public
+    # as a stand-in
+    if native.bazel_version.startswith("5."):
+        visibility = "//visibility:public"
+    else:
+        visibility = "@rules_python//:__subpackages__"
+
     rctx.file("BUILD", ROOT_BUILD_TEMPLATE.format(
-        py_internal_dep = '"@rules_python//tools/build_defs/python/private:py_internal_renamed_bzl"',
-        visibility = "@rules_python//:__subpackages__",
+        py_internal_dep = py_internal_dep,
+        visibility = visibility,
     ))
-    rctx.file("py_internal.bzl", _PY_INTERNAL_SHIM)
+    rctx.file("py_internal.bzl", shim_content)
 
     rctx.file(
         "extra_transition_settings.bzl",
@@ -130,7 +155,7 @@ def _internal_config_repo_impl(rctx):
 internal_config_repo = repository_rule(
     implementation = _internal_config_repo_impl,
     configure = True,
-    environ = [_ENABLE_PIPSTAR_ENVVAR_NAME],
+    environ = [_ENABLE_PYSTAR_ENVVAR_NAME],
     attrs = {
         "transition_setting_generators": attr.string_list_dict(),
         "transition_settings": attr.string_list(),

python/private/interpreter.bzl

@@ -72,7 +72,7 @@ interpreter_binary = rule(
             mandatory = True,
         ),
         "_bash_runfiles": attr.label(
-            default = "@rules_shell//shell/runfiles",
+            default = "@bazel_tools//tools/bash/runfiles",
         ),
         "_template": attr.label(
             default = "//python/private:interpreter_tmpl.sh",

python/private/local_runtime_repo.bzl

@@ -71,7 +71,7 @@ def _symlink_first_library(rctx, logger, libraries):
         else:
             linked = "lib/{}".format(origin.basename)
         logger.debug("Symlinking {} to {}".format(origin, linked))
-        rctx.watch(origin)
+        repo_utils.watch(rctx, origin)
         rctx.symlink(origin, linked)
         break
 
@@ -142,7 +142,7 @@ def _local_runtime_repo_impl(rctx):
     # path is an error. Silently skip, since includes are only necessary
     # if C extensions are built.
     if include_path.exists and include_path.is_dir:
-        rctx.watch_tree(include_path)
+        repo_utils.watch_tree(rctx, include_path)
     else:
         pass
 
@@ -268,7 +268,7 @@ def _resolve_interpreter_path(rctx):
         resolved_path = result.binary
         describe_failure = result.describe_failure
     else:
-        rctx.watch(rctx.attr.interpreter_path)
+        repo_utils.watch(rctx, rctx.attr.interpreter_path)
         resolved_path = rctx.path(rctx.attr.interpreter_path)
         if not resolved_path.exists:
             describe_failure = lambda: "Path not found: {}".format(repr(rctx.attr.interpreter_path))

python/private/py_cc_link_params_info.bzl

@@ -14,14 +14,15 @@
 """Providers for Python rules."""
 
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
+load(":util.bzl", "define_bazel_6_provider")
 
 def _PyCcLinkParamsInfo_init(cc_info):
     return {
         "cc_info": CcInfo(linking_context = cc_info.linking_context),
     }
 
 # buildifier: disable=name-conventions
-PyCcLinkParamsInfo, _unused_raw_py_cc_link_params_provider_ctor = provider(
+PyCcLinkParamsInfo, _unused_raw_py_cc_link_params_provider_ctor = define_bazel_6_provider(
     doc = ("Python-wrapper to forward {obj}`CcInfo.linking_context`. This is to " +
            "allow Python targets to propagate C++ linking information, but " +
            "without the Python target appearing to be a valid C++ rule dependency"),

python/private/py_info.bzl

@@ -16,6 +16,7 @@
 load("@rules_python_internal//:rules_python_config.bzl", "config")
 load(":builders.bzl", "builders")
 load(":reexports.bzl", "BuiltinPyInfo")
+load(":util.bzl", "define_bazel_6_provider")
 
 def _VenvSymlinkKind_typedef():
     """An enum of types of venv directories.
@@ -159,7 +160,7 @@ def _PyInfo_init(
         "venv_symlinks": venv_symlinks,
     }
 
-PyInfo, _unused_raw_py_info_ctor = provider(
+PyInfo, _unused_raw_py_info_ctor = define_bazel_6_provider(
     doc = """Encapsulates information provided by the Python rules.
 
 Instead of creating this object directly, use {obj}`PyInfoBuilder` and