fix(bzlmod pip.parse): allow requirements with duplicate package lines#1620
Merged
rickeylev merged 2 commits intobazel-contrib:mainfrom Dec 19, 2023
Merged
fix(bzlmod pip.parse): allow requirements with duplicate package lines#1620rickeylev merged 2 commits intobazel-contrib:mainfrom
rickeylev merged 2 commits intobazel-contrib:mainfrom
Conversation
94abe26 to
6664a12
Compare
aignas
approved these changes
Dec 17, 2023
Collaborator
aignas
left a comment
There was a problem hiding this comment.
Thanks for adding a test for this!
Collaborator
|
The test failures look like the |
|
@rickeylev I patched this to our local environment and can confirm it works! |
When a package has extras, the requirements parsing discards the extra portion of the name and just returns the base name. When a repository is created for each entry, this means the same name is used for multiple repositories. Under WORKSPACE builds, duplicate repository names aren't an error. It appears the last defined repo takes affect. Under bzlmod, duplicate repo names are an error. To fix, mimic the last-defined-wins behavior in bzlmod by using a map to dedupe the package names. Fixes bazel-contrib#1615
6664a12 to
34298f0
Compare
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
3 participants
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.
Requirements files are permitted to have duplicate lines for the same package. An example
of this is having separate lines for a package and its extras. When we parse requirements,
the parser discards the "extra" portion of the entry and returns a list of all the packages
as-is. When a repository is created for each entry, this means the same name is used for
multiple repositories.
Under WORKSPACE builds, duplicate repository names aren't an error. It appears that last
defined repo takes affect. Under bzlmod, duplicate repo names are an error.
To fix, mimic the last-defined-wins behavior in bzlmod by using a map to dedupe the package names.
Fixes #1615