Misc leftover changes discovered while updating protobuff version #6736
Conversation
|
@droazen This is good now I think. |
.travis.yml
Outdated
| @@ -21,6 +21,7 @@ env: | |||
| - SCALA_VERSION=2.11 TEST_TYPE=wdlGen | |||
| global: | |||
| #gradle needs this | |||
| - NO_GCE_CHECK=true | |||
There was a problem hiding this comment.
This is irrelevant but we might as well put it in. Hmn, I should move it above the comment though...
| @@ -302,7 +302,7 @@ public static void assertGenotypesAreEqual(final Genotype actual, final Genotype | |||
|
|
|||
| public static void assertGenotypesAreEqual(final Genotype actual, final Genotype expected, final List<String> extendedAttributesToIgnore) { | |||
| Assert.assertEquals(actual.getSampleName(), expected.getSampleName(), "Genotype names"); | |||
| Assert.assertTrue(CollectionUtils.isEqualCollection(actual.getAlleles(), expected.getAlleles()), "Genotype alleles"); | |||
| Assert.assertTrue(CollectionUtils.isEqualCollection(actual.getAlleles(), expected.getAlleles()), "Genotype alleles: " + actual.getAlleles() + " != " + expected.getAlleles()); | |||
There was a problem hiding this comment.
This change came up while testing things but I figured it's useful so I'd keep it.
|
Most of these dependency changes are reflected in #6759. We should let that PR go in first, then rebase this one. |
|
@lbergelson Now that #6759 is merged, can you rebase this branch onto master to reconcile it with the extensive dependency changes in that PR? |
lbergelson
force-pushed
the
lb_move_to_sane_protobuff
branch
from
c28efd2 to
8a8fea7
Compare
lbergelson
force-pushed
the
lb_move_to_sane_protobuff
branch
from
8a8fea7 to
1694572
Compare
lbergelson
changed the title
|
@droazen there are 3 minor changes here that were left over after the other branch got merged. The only controversial one might be unforcing the protobuff version, but I think it makes sense to just let it float at whatever the other dependencies require since that's what everything else does. |
lbergelson
force-pushed
the
lb_move_to_sane_protobuff
branch
from
1694572 to
4fe7d6f
Compare
|
Closing this. Moved the 1 relevant change to #8725 |
Moving us off of of the weird beta protobuf version to the newest 3.x release.