Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update htsjdk to 2.21.0 #6250

Merged
merged 3 commits into from
Nov 6, 2019
Merged

update htsjdk to 2.21.0 #6250

merged 3 commits into from
Nov 6, 2019

Conversation

lbergelson
Copy link
Member

Upgrading htsjdk to 2.21.0.

This includes a change that relaxes restrictions on loading vcfs with sequence dictionaries that are missing lengths. This effected one of the tests which I changed a bit. We could also implement blanket ban on sequence dictionaries with missing lengths in our sequence dictionary validation code, but we currently allow them for sam/bam as far as I can tell and have tests that take them into account.

change in UpdateVCFSequenceDictionary to prevent 0 length sequences
dict.getSequences().stream()
.filter( s -> s.getSequenceLength() == SAMSequenceRecord.UNKNOWN_SEQUENCE_LENGTH)
.map(SAMSequenceRecord::getSequenceName)
.collect(Collectors.joining(",")));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think we should use .limit(20) or something? There might be a lot...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's a good point

@@ -209,11 +211,22 @@ else if (hasReference()) {
if (resultDictionary == null || resultDictionary.getSequences().isEmpty()) {
throw new CommandLineException.BadArgumentValue(
String.format(
"The specified dictionary source has an empty or invalid sequence dictionary",
"The specified dictionary source has an empty or invalid sequence dictionary: %S",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the upper casing deliberate %S ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh.. no.. accidental

Copy link
Collaborator

@cmnbroad cmnbroad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once tests pass.

@lbergelson lbergelson merged commit 9f7aa0d into master Nov 6, 2019
@lbergelson lbergelson deleted the lb_test_htsjdk branch November 6, 2019 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants