refactor: split out the standalone interpreter utility function

Author: aignas

examples/bzlmod/MODULE.bazel.lock

@@ -229,6 +229,7 @@ bzl_library(
     name = "repositories_bzl",
     srcs = ["repositories.bzl"],
     deps = [
+        "//python/private:is_standalone_interpreter_bzl",
         "//python/private:py_repositories_bzl",
         "//python/private:python_repositories_bzl",
         "//python/private:python_repository_bzl",

python/BUILD.bazel

@@ -123,6 +123,14 @@ bzl_library(
     deps = [":bzlmod_enabled_bzl"],
 )
 
+bzl_library(
+    name = "is_standalone_interpreter_bzl",
+    srcs = ["is_standalone_interpreter.bzl"],
+    deps = [
+        ":repo_utils_bzl",
+    ],
+)
+
 bzl_library(
     name = "normalize_name_bzl",
     srcs = ["normalize_name.bzl"],
@@ -174,7 +182,6 @@ bzl_library(
         ":full_version_bzl",
         ":internal_config_repo_bzl",
         ":python_repository_bzl",
-        ":repo_utils_bzl",
         ":toolchains_repo_bzl",
         "//python:versions_bzl",
         "//python/private/pypi:deps_bzl",

python/private/BUILD.bazel

@@ -0,0 +1,50 @@
+# Copyright 2024 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.
+
+"""This file contains repository rules and macros to support toolchain registration.
+"""
+
+load(":repo_utils.bzl", "repo_utils")
+
+STANDALONE_INTERPRETER_FILENAME = "STANDALONE_INTERPRETER"
+
+def is_standalone_interpreter(rctx, python_interpreter_path, *, logger = None):
+    """Query a python interpreter target for whether or not it's a rules_rust provided toolchain
+
+    Args:
+        rctx: {type}`repository_ctx` The repository rule's context object.
+        python_interpreter_path: {type}`path` A path representing the interpreter.
+        logger: Optional logger to use for operations.
+
+    Returns:
+        {type}`bool` Whether or not the target is from a rules_python generated toolchain.
+    """
+
+    # Only update the location when using a hermetic toolchain.
+    if not python_interpreter_path:
+        return False
+
+    # This is a rules_python provided toolchain.
+    return repo_utils.execute_unchecked(
+        rctx,
+        op = "IsStandaloneInterpreter",
+        arguments = [
+            "ls",
+            "{}/{}".format(
+                python_interpreter_path.dirname,
+                STANDALONE_INTERPRETER_FILENAME,
+            ),
+        ],
+        logger = logger,
+    ).return_code == 0

python/private/is_standalone_interpreter.bzl

@@ -306,9 +306,9 @@ bzl_library(
         ":patch_whl_bzl",
         ":pypi_repo_utils_bzl",
         ":whl_target_platforms_bzl",
-        "//python:repositories_bzl",
         "//python/private:auth_bzl",
         "//python/private:envsubst_bzl",
+        "//python/private:is_standalone_interpreter_bzl",
         "//python/private:repo_utils_bzl",
     ],
 )

python/private/pypi/BUILD.bazel

@@ -16,7 +16,7 @@
 
 load("//python/private:auth.bzl", "AUTH_ATTRS", "get_auth")
 load("//python/private:envsubst.bzl", "envsubst")
-load("//python/private:python_repositories.bzl", "is_standalone_interpreter")
+load("//python/private:is_standalone_interpreter.bzl", "is_standalone_interpreter")
 load("//python/private:repo_utils.bzl", "REPO_DEBUG_ENV_VAR", "repo_utils")
 load(":attrs.bzl", "ATTRS", "use_isolated")
 load(":deps.bzl", "all_repo_names")

python/private/pypi/whl_library.bzl

@@ -27,7 +27,6 @@ load(":bzlmod_enabled.bzl", "BZLMOD_ENABLED")
 load(":coverage_deps.bzl", "coverage_dep")
 load(":full_version.bzl", "full_version")
 load(":python_repository.bzl", "python_repository")
-load(":repo_utils.bzl", "repo_utils")
 load(
     ":toolchains_repo.bzl",
     "host_toolchain",
@@ -36,38 +35,6 @@ load(
     "toolchains_repo",
 )
 
-STANDALONE_INTERPRETER_FILENAME = "STANDALONE_INTERPRETER"
-
-def is_standalone_interpreter(rctx, python_interpreter_path, *, logger = None):
-    """Query a python interpreter target for whether or not it's a rules_rust provided toolchain
-
-    Args:
-        rctx: {type}`repository_ctx` The repository rule's context object.
-        python_interpreter_path: {type}`path` A path representing the interpreter.
-        logger: Optional logger to use for operations.
-
-    Returns:
-        {type}`bool` Whether or not the target is from a rules_python generated toolchain.
-    """
-
-    # Only update the location when using a hermetic toolchain.
-    if not python_interpreter_path:
-        return False
-
-    # This is a rules_python provided toolchain.
-    return repo_utils.execute_unchecked(
-        rctx,
-        op = "IsStandaloneInterpreter",
-        arguments = [
-            "ls",
-            "{}/{}".format(
-                python_interpreter_path.dirname,
-                STANDALONE_INTERPRETER_FILENAME,
-            ),
-        ],
-        logger = logger,
-    ).return_code == 0
-
 # Wrapper macro around everything above, this is the primary API.
 def python_register_toolchains(
         name,

python/private/python_repositories.bzl

@@ -15,11 +15,14 @@
 """This file contains macros to be called during WORKSPACE evaluation.
 """
 
-load("//python/private:py_repositories.bzl", _py_repositories = "py_repositories")
 load(
-    "//python/private:python_repositories.bzl",
+    "//python/private:is_standalone_interpreter.bzl",
     _STANDALONE_INTERPRETER_FILENAME = "STANDALONE_INTERPRETER_FILENAME",
     _is_standalone_interpreter = "is_standalone_interpreter",
+)
+load("//python/private:py_repositories.bzl", _py_repositories = "py_repositories")
+load(
+    "//python/private:python_repositories.bzl",
     _python_register_multi_toolchains = "python_register_multi_toolchains",
     _python_register_toolchains = "python_register_toolchains",
 )