Fix profile repeated build requires #8463
Merged
Conversation
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
jgsogo
approved these changes
Feb 8, 2021
|
I like the changes, I think they make sense, IMO existing test was testing the bug. |
SSE4
reviewed
Feb 8, 2021
conans/client/profile_loader.py
Outdated
| @@ -137,7 +137,7 @@ def _load_profile(text, profile_path, default_folder): | |||
| for include in profile_parser.get_includes(): | |||
| # Recursion !! | |||
| profile, included_vars = read_profile(include, cwd, default_folder) | |||
| inherited_profile.update(profile) | |||
| inherited_profile.update_profile(profile) | |||
There was a problem hiding this comment.
IMO profile.update_profile() looks too redundand. profile.update() is nice and self-explaining.
There was a problem hiding this comment.
Until you try to search for occurrences, or code calling this method and it becomes almost impossible to know, and you need to rely on CI running to find all occurrences.
There was a problem hiding this comment.
Agree that the update_profile() is not great and redundant. I have replaced it for compose() because it doesn't conflict with common dicts update() and also because in our docs we refer to this operation as "Profile composition".
Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>
Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>
SSE4
approved these changes
Feb 16, 2021
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.
Changelog: Bugfix: Fix repeated
build_requires, including conflicting versions in profile composition or inclusion that repeats[build_requires]values.Docs: Omit
Comes from #8205 (comment)