fix: generation of toolchain aliases //:defs.bzl file. (bazel-contrib#1088)

oxidase · web-flow · commit 5ff514ab84c0 · 2023-03-08T11:16:02.000-08:00
## PR Checklist

Please check if your PR fulfills the following requirements:

- [ ] Tests for the changes have been added (for bug fixes / features)
- [ ] Docs have been added / updated (for bug fixes / features)


## PR Type

What kind of change does this PR introduce?

&lt;!-- Please check the one that applies to this PR using "x". --&gt;

- [X] Bugfix
- [ ] Feature (please, look at the "Scope of the project" section in the
README.md file)
- [ ] Code style update (formatting, local variables)
- [ ] Refactoring (no functional changes, no api changes)
- [ ] Build related changes
- [ ] CI related changes
- [ ] Documentation content changes
- [ ] Other... Please describe:


## What is the current behavior?
&lt;!-- Please describe the current behavior that you are modifying, or
link to a relevant issue. --&gt;

With `common --experimental_enable_bzlmod` option defs.bzl is generated
as
```
load("@rules_python~override//python/config_settings:transition.bzl", _py_binary = "py_binary", _py_test = "py_test")
load("@rules_python~override//python:pip.bzl", _compile_pip_requirements = "compile_pip_requirements")
```
and these lines cause a problem at
```
load("@python3_9//:defs.bzl", "interpreter")
```
as
```

ERROR: .../BUILD:25:11: error loading package 'src': at .../external/rules_python~override~python~python3_9/defs.bzl:4:6: Unable to find package for @[unknown repo 'rules_python~override' requested from @rules_python~override~python~python3_9]//python:pip.bzl: The repository '@[unknown repo 'rules_python~override' requested from @rules_python~override~python~python3_9]' could not be resolved: No repository visible as '@rules_python~override' from repository '@rules_python~override~python~python3_9'. and referenced by '...'
```


Issue Number: N/A


## What is the new behavior?

Generated load statements
```
load("@@rules_python~override//python/config_settings:transition.bzl", _py_binary = "py_binary", _py_test = "py_test")
load("@@rules_python~override//python:pip.bzl", _compile_pip_requirements = "compile_pip_requirements")
```

## Does this PR introduce a breaking change?

- [ ] Yes
- [X] No


&lt;!-- If this PR contains a breaking change, please describe the impact
and migration path for existing applications below. --&gt;


## Other information
diff --git a/examples/bzlmod/BUILD.bazel b/examples/bzlmod/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@pip//:requirements.bzl", "requirement")
+load("@python3_9//:defs.bzl", py_test_with_transition = "py_test")
 load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
 load("@rules_python//python:pip.bzl", "compile_pip_requirements")
 
@@ -35,3 +36,10 @@ py_test(
     srcs = ["test.py"],
     deps = [":lib"],
 )
+
+py_test_with_transition(
+    name = "test_with_transition",
+    srcs = ["test.py"],
+    main = "test.py",
+    deps = [":lib"],
+)
diff --git a/examples/bzlmod/MODULE.bazel b/examples/bzlmod/MODULE.bazel
@@ -16,6 +16,7 @@ python.toolchain(
     configure_coverage_tool = True,
     python_version = "3.9",
 )
+use_repo(python, "python3_9")
 use_repo(python, "python3_9_toolchains")
 
 register_toolchains(
diff --git a/python/private/toolchains_repo.bzl b/python/private/toolchains_repo.bzl
@@ -31,10 +31,13 @@ load(
     "WINDOWS_NAME",
 )
 
+def get_repository_name(repository_workspace):
+    dummy_label = "//:_"
+    return str(repository_workspace.relative(dummy_label))[:-len(dummy_label)] or "@"
+
 def _toolchains_repo_impl(rctx):
-    rules_python_repository_name = rctx.attr._rules_python_workspace.workspace_name
-    python_version_constraint = "@{rules_python}//python/config_settings:is_python_{python_version}".format(
-        rules_python = rules_python_repository_name,
+    python_version_constraint = "{rules_python}//python/config_settings:is_python_{python_version}".format(
+        rules_python = get_repository_name(rctx.attr._rules_python_workspace),
         python_version = rctx.attr.python_version,
     )
 
@@ -90,8 +93,6 @@ def _toolchain_aliases_impl(rctx):
     is_windows = (os_name == WINDOWS_NAME)
     python3_binary_path = "python.exe" if is_windows else "bin/python3"
 
-    rules_python_repository_name = rctx.attr._rules_python_workspace.workspace_name
-
     # Base BUILD file for this repository.
     build_contents = """\
 # Generated by python/private/toolchains_repo.bzl
@@ -123,8 +124,8 @@ alias(name = "pip",             actual = select({{":" + item: "@{py_repository}_
     rctx.file("defs.bzl", content = """\
 # Generated by python/private/toolchains_repo.bzl
 
-load("@{rules_python}//python/config_settings:transition.bzl", _py_binary = "py_binary", _py_test = "py_test")
-load("@{rules_python}//python:pip.bzl", _compile_pip_requirements = "compile_pip_requirements")
+load("{rules_python}//python/config_settings:transition.bzl", _py_binary = "py_binary", _py_test = "py_test")
+load("{rules_python}//python:pip.bzl", _compile_pip_requirements = "compile_pip_requirements")
 
 host_platform = "{host_platform}"
 interpreter = "@{py_repository}_{host_platform}//:{python3_binary_path}"
@@ -156,7 +157,7 @@ def compile_pip_requirements(name, **kwargs):
         py_repository = rctx.attr.user_repository_name,
         python_version = rctx.attr.python_version,
         python3_binary_path = python3_binary_path,
-        rules_python = rules_python_repository_name,
+        rules_python = get_repository_name(rctx.attr._rules_python_workspace),
     ))
 
 toolchain_aliases = repository_rule(

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ python.toolchain(`
`16`	`16`	`configure_coverage_tool = True,`
`17`	`17`	`python_version = "3.9",`
`18`	`18`	`)`
	`19`	`+use_repo(python, "python3_9")`
`19`	`20`	`use_repo(python, "python3_9_toolchains")`
`20`	`21`
`21`	`22`	`register_toolchains(`