Skip to content

Commit

Permalink
ex-266 (jebene/dkriti) minor change to make travis pass on 3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
dkriti committed May 27, 2015
1 parent b57bcb0 commit 1ebea78
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion jacquard/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def _get_desired_format_tags(self):
"format tags. Review inputs/usage and try again")
raise utils.UsageError(msg, self.format_tag_regexes)

return format_tag_list
return sorted(format_tag_list)

def _get_metaheader_subset(self):
def _handle_format_metaheaders(metaheader):
Expand Down
2 changes: 1 addition & 1 deletion test/merge_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def test_gets_desired_format_tags(self):
file_reader = MockFileReader("A.mutect.vcf", file_contents)
merge_vcf_reader = merge.MergeVcfReader(file_reader, ".*")

self.assertEquals(["DP", "AF"], merge_vcf_reader.desired_format_tags)
self.assertEquals(["AF", "DP"], merge_vcf_reader.desired_format_tags)

def test_gets_desired_format_tags_warnsIfUnusedRegex(self):
file_contents = ["##metaheader1\n",
Expand Down

0 comments on commit 1ebea78

Please sign in to comment.