-
Notifications
You must be signed in to change notification settings - Fork 128
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
Invalid none key #1113
Invalid none key #1113
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1113 +/- ##
==========================================
+ Coverage 72.89% 72.94% +0.04%
==========================================
Files 79 79
Lines 8308 8315 +7
Branches 1696 1698 +2
==========================================
+ Hits 6056 6065 +9
+ Misses 1963 1962 -1
+ Partials 289 288 -1 ☔ View full report in Codecov by Sentry. |
Looks good, needs a changelog entry though. |
@joverlee521 how would you feel about rebasing this and adding a Changelog entry so it can get merged? Still seems like a worthwhile change, yeah? |
a0756a9
to
50c66e0
Compare
Rebased and added changelog entry. I've also made additional changes to make "none" an invalid This is ready for a fresh review after ~2 years 😅 |
50c66e0
to
6ca6dac
Compare
6ca6dac
to
fd2cff9
Compare
Make "none" an invalid key for "tree.branch_attrs.labels", "tree.node_attrs", and "colorings" because the "none" key is used internally in Auspice to hide branch labels¹ and tip labels². ¹ https://github.com/nextstrain/auspice/blob/a4487b59989270b860d2508636f09ebdbc50d0f8/src/util/treeJsonProcessing.js#L56 ² nextstrain/auspice#1618
Update `augur export v2` to warn about the invalid metadata column and coloring "none" key and skip it in export so that it does not clash with Auspice's internal use of "none" to hide tip labels.¹ ¹ <nextstrain/auspice#1618>
fd2cff9
to
54cc39f
Compare
Did one final rebase to ensure the changelog isn't messed up after the latest release. Will merge once the tests pass. |
Description of proposed changes
export v2
to warn about invalid "none" key and ignore it in exports.export v2
for branch labels to ignore the "none" key because it is currently hard-coded to only export "clades" and "aa" as branch labels. We should ignore "none" keys for branch labels once we allow for arbitrary labels in Allow users to specify arbitrary branch & clade labels #728.Related issue(s)
Related to nextstrain/auspice#1618
Testing
Checklist