feat(bzlmod): Adding base_url attr to python.toolchain #1216
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,15 +24,27 @@ load("@rules_python//python/private:toolchains_repo.bzl", "get_host_os_arch", "g | |
| def _python_impl(module_ctx): | ||
| for mod in module_ctx.modules: | ||
| for toolchain_attr in mod.tags.toolchain: | ||
| if toolchain_attr.base_url: | ||
| python_register_toolchains( | ||
| name = toolchain_attr.name, | ||
| python_version = toolchain_attr.python_version, | ||
| bzlmod = True, | ||
| # Toolchain registration in bzlmod is done in MODULE file | ||
| register_toolchains = False, | ||
| register_coverage_tool = toolchain_attr.configure_coverage_tool, | ||
| ignore_root_user_error = toolchain_attr.ignore_root_user_error, | ||
| base_url = toolchain_attr.base_url, | ||
| ) | ||
| else: | ||
| python_register_toolchains( | ||
| name = toolchain_attr.name, | ||
| python_version = toolchain_attr.python_version, | ||
| bzlmod = True, | ||
| # Toolchain registration in bzlmod is done in MODULE file | ||
| register_toolchains = False, | ||
| register_coverage_tool = toolchain_attr.configure_coverage_tool, | ||
| ignore_root_user_error = toolchain_attr.ignore_root_user_error, | ||
| ) | ||
| host_hub_name = toolchain_attr.name + "_host_interpreter" | ||
| _host_hub( | ||
| name = host_hub_name, | ||
|
|
@@ -44,6 +56,14 @@ python = module_extension( | |
| tag_classes = { | ||
| "toolchain": tag_class( | ||
| attrs = { | ||
| "base_url": attr.string( | ||
| mandatory = False, | ||
| doc = """\ | ||
| The URL that is used to override rules_python DEFAULT_RELEASE_BASE_URL. This rule set downloads | ||
| the different Python binaries from this website. Override this URL if you want to have rules_python | ||
| download the hermetic versions of Python from a different website. | ||
| """, | ||
|
There was a problem hiding this comment. Should we use the bazel downloader for this instead? There was a problem hiding this comment. Great question! I asked the folks on #1172 to get their opinion. I think folks are using base_url, so if we are not going to support it people will have to migrate to this as well. There was a problem hiding this comment. See #1172 (comment) |
||
| ), | ||
| "configure_coverage_tool": attr.bool( | ||
| mandatory = False, | ||
| doc = "Whether or not to configure the default coverage tool for the toolchains.", | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rickeylev not sure if there is a cleaner way to do this. If we don't set the base_url when we call python.toolchain, we end up with an empty string passed in. Then python_register_toolchains passes in an empty value to python_repository. We may have a weird use case where an empty URL is allowed; if not, I can test for an empty URL in python_register_toolchains, which is fewer lines of code.