chore: use rules_python's py_runtime in generated toolchains

This makes rules_python compatible with disabling using the native rules in Bazel. Work towards #1069
bazelbuild · Dec 12, 2023 · 1a48a42 · 1a48a42
1 parent ee2cc93
commit 1a48a42
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/python/private/common/py_runtime_rule.bzl b/python/private/common/py_runtime_rule.bzl
@@ -122,6 +122,8 @@ interpreter.
 # Example
 
 ```
+load("@rules_python//python:py_runtime.bzl", "py_runtime")
+
 py_runtime(
     name = "python-2.7.12",
     files = glob(["python-2.7.12/**"]),

diff --git a/python/private/py_runtime_pair_rule.bzl b/python/private/py_runtime_pair_rule.bzl
@@ -108,7 +108,8 @@ Example usage:
 ```python
 # In your BUILD file...
 
-load("@rules_python//python:defs.bzl", "py_runtime_pair")
+load("@rules_python//python:py_runtime.bzl", "py_runtime")
+load("@rules_python//python:py_runtime_pair.bzl", "py_runtime_pair")
 
 py_runtime(
     name = "my_py2_runtime",

diff --git a/python/py_runtime_pair.bzl b/python/py_runtime_pair.bzl
@@ -47,7 +47,8 @@ def py_runtime_pair(name, py2_runtime = None, py3_runtime = None, **attrs):
     ```python
     # In your BUILD file...
 
-    load("@rules_python//python:defs.bzl", "py_runtime_pair")
+    load("@rules_python//python:py_runtime.bzl", "py_runtime")
+    load("@rules_python//python:py_runtime_pair.bzl", "py_runtime_pair")
 
     py_runtime(
         name = "my_py3_runtime",

diff --git a/python/repositories.bzl b/python/repositories.bzl
@@ -289,7 +289,8 @@ def _python_repository_impl(rctx):
     build_content = """\
 # Generated by python/repositories.bzl
 
-load("@bazel_tools//tools/python:toolchain.bzl", "py_runtime_pair")
+load("@rules_python//python:py_runtime.bzl", "py_runtime")
+load("@rules_python//python:py_runtime_pair.bzl", "py_runtime_pair")
 load("@rules_python//python/cc:py_cc_toolchain.bzl", "py_cc_toolchain")
 
 package(default_visibility = ["//visibility:public"])