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 bazelbuild#1069
rickeylev · Dec 14, 2023 · f79ecad · f79ecad
1 parent bbec4c2
commit f79ecad
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/.bazelignore b/.bazelignore
@@ -16,3 +16,4 @@ examples/bzlmod_build_file_generation/bazel-bzlmod_build_file_generation
 examples/pip_parse/bazel-pip_parse
 examples/py_proto_library/bazel-py_proto_library
 tests/ignore_root_user_error/bazel-ignore_root_user_error
+tests/pip_repository_entry_points/bazel-pip_repository_entry_points
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
@@ -113,7 +113,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"])