add desiutil.depend.mergedep + tests #164
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
|
I'll try to review this evening. |
weaverba137
approved these changes
Feb 13, 2021
py/desiutil/depend.py
Outdated
| Raises | ||
| ------ | ||
| ValueError | ||
| If `conflict == 'exception'` and the same dependency name appears |
There was a problem hiding this comment.
In RST, double backticks are equivalent to <code></code>, unlike MarkDown.
py/desiutil/depend.py
Outdated
| in both headers with different values; or if `conflict` isn't one | ||
| of 'src', 'dst', or 'exception'. | ||
| ''' | ||
| if not conflict in ('src', 'dst', 'exception'): |
There was a problem hiding this comment.
conflict not in is the more typical idiom.
|
thanks, comments addressed, merging. |
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 PR adds
desiutil.depend.mergedepas a utility function to merge DEPNAMnn + DEPVERnn dependencies+versions from one header into another. We messed this up with the blanc run by simply copying header keywords from one to the other, resulting in the sameDEPNAMnnbeing listed more than once for different dependencies. Thismergedepfunction takes care of rearranging numbers as needed. See the tests for examples.