Repository navigation
Stop needs_merlin_expansion extending the caller's label list - #601
Open
arpitjain099 wants to merge 1 commit into
Open
arpitjain099 wants to merge 1 commit into
arpitjain099 wants to merge 1 commit into
Conversation
Signed-off-by: Arpit Jain <arpitjain099@gmail.com>
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.
needs_merlin_expansiondoeslabels += sample_keywords, and+=on a list extends it in place, so the caller's list gets the four sample keywords appended every time it's called.MerlinSpec.get_tasks_per_steptakescolumn_labels = self.merlin["samples"]["column_labels"]without copying and then calls this once per step, so a spec with several steps ends up with its ownmerlin.samples.column_labelscarrying four bogus entries per step. Theparameter_labelscall next to it is safe only because it passesinclude_sample_keywords=False.Changed to
labels = labels + sample_keywords, which keeps the local view and leaves the argument alone.Added
tests/unit/utils/test_needs_merlin_expansion.py: the list is unchanged after a call, the sample keywords still match with and without the flag, and repeated calls give the same answer. Two of the three fail on develop.tests/unit/utilsandtests/unit/specare 211 passing with the change.I didn't touch the CHANGELOG since there's no Unreleased section to add to. Say the word if you'd like one.