refactor: make bzlmod directly aware of created toolchain repo names#2885
Merged
rickeylev merged 2 commits intobazel-contrib:mainfrom May 18, 2025
Merged
Conversation
0f0160d to
acf4136
Compare
Collaborator
Author
|
Ready for PTAL; dependency PR merged |
aignas
approved these changes
May 18, 2025
Comment on lines
+278
to
+279
| for i, toolchain_info in enumerate(py.toolchains): | ||
| is_last = (i + 1) == len(py.toolchains) |
Collaborator
There was a problem hiding this comment.
Suggested change
| for i, toolchain_info in enumerate(py.toolchains): | |
| is_last = (i + 1) == len(py.toolchains) | |
| all_toolchains = zip( | |
| [False] * len(py.toolchains), | |
| py.toolchains, | |
| )[:-1] | |
| all_toolchains.append( | |
| (True, py.toolchains[-1]) | |
| ) | |
| for set_python_toolchain_constraint, toolchain_info in all_toolchains: |
You could do this, I am curious what is more readable.
Also, I can't remember if the last toolchain is still special because we always know the python_version flag setting, so the comment/logic may be outdated. At least when I was bugfixing code in this location I think that the case when the python_version does not match the preceding entries never happens in bzlmod.
Collaborator
Author
There was a problem hiding this comment.
re: if no-version occurs: Good point. It would occur if...hmm...If --python_version was set to a version that wasn't known? This could occur if someone registered a toolchain outside of python.toolchain()
…into refactor.bzlmod.flatten.tc.registering
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This makes python_register_toolchains return the repo names it created, which allows
the bzlmod code to be directly aware of the repos that were created instead of having
to rely on assuming the names via the platform keys.
This is to facilitate python_register_toolchains creating a more arbitrary subset
of platform-specific repos.
Work towards #2081