commit e18e1a3bbd372fd0351277794155b5b9045fbe37
author UebelAndre <github@uebelandre.com> Wed Mar 16 10:16:07 2022 -0700
committer GitHub <noreply@github.com> Wed Mar 16 10:16:07 2022 -0700
tree 3e35ed5a10ba62b5710addf09caf992cf3811da1
parent 6c20dcd860702ef295a7902aee8d22955877d0f5

Allow `python_register_toolchains.name` to be the resolved interpreter repo (#656)

* Allow `python_register_toolchains.name` to be the resolved interpreter repo

* Removed `{name}_resolved_interpreter` repository

README.md

diff --git a/README.md b/README.md
index ac57342..6b5297e 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@
     python_version = "3.9",
 )
 
-load("@python3_9_resolved_interpreter//:defs.bzl", "interpreter")
+load("@python3_9//:defs.bzl", "interpreter")
 
 load("@rules_python//python:pip.bzl", "pip_parse")
 

examples/pip_install/WORKSPACE

diff --git a/examples/pip_install/WORKSPACE b/examples/pip_install/WORKSPACE
index 029a5a3..1fabf94 100644
--- a/examples/pip_install/WORKSPACE
+++ b/examples/pip_install/WORKSPACE
@@ -23,7 +23,7 @@
     python_version = "3.9",
 )
 
-load("@python39_resolved_interpreter//:defs.bzl", "interpreter")
+load("@python39//:defs.bzl", "interpreter")
 load("@rules_python//python:pip.bzl", "pip_install")
 
 pip_install(

examples/pip_parse/WORKSPACE

diff --git a/examples/pip_parse/WORKSPACE b/examples/pip_parse/WORKSPACE
index ae3173c..e96db9f 100644
--- a/examples/pip_parse/WORKSPACE
+++ b/examples/pip_parse/WORKSPACE
@@ -12,7 +12,7 @@
     python_version = "3.9",
 )
 
-load("@python39_resolved_interpreter//:defs.bzl", "interpreter")
+load("@python39//:defs.bzl", "interpreter")
 load("@rules_python//python:pip.bzl", "pip_parse")
 
 pip_parse(

python/repositories.bzl

diff --git a/python/repositories.bzl b/python/repositories.bzl
index 3ee418a..02b5011 100644
--- a/python/repositories.bzl
+++ b/python/repositories.bzl
@@ -266,7 +266,7 @@
         ))
 
     resolved_interpreter_os_alias(
-        name = "{name}_resolved_interpreter".format(name = name),
+        name = name,
         user_repository_name = name,
     )
 

python/tests/toolchains/run_acceptance_test.py.tmpl

diff --git a/python/tests/toolchains/run_acceptance_test.py.tmpl b/python/tests/toolchains/run_acceptance_test.py.tmpl
index 578868f..51eba3d 100644
--- a/python/tests/toolchains/run_acceptance_test.py.tmpl
+++ b/python/tests/toolchains/run_acceptance_test.py.tmpl
@@ -52,7 +52,7 @@
             )
 
     def test_match_toolchain(self):
-        stream = os.popen("bazel run @python_resolved_interpreter//:python3 -- --version")
+        stream = os.popen("bazel run @python//:python3 -- --version")
         output = stream.read().strip()
         self.assertEqual(output, "Python %python_version%")