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

feat: add clade inheritance, requires new augur clades feature #855

Merged
merged 3 commits into from
Apr 27, 2022

Conversation

corneliusroemer
Copy link
Member

@corneliusroemer corneliusroemer commented Feb 4, 2022

Description of proposed changes

This is preparation for once augur PR nextstrain/augur#846 is merged and released.

New inheritance feature allows more succinct and reliable clade definitions.

Testing

Augur clades function read_in_clade_definitions should be run on old and new version of clades.tsv to check the output is consistent.

Importantly, if this is merged, we need to update the min augur version to the augur version of the new feature release.

Requires augur version 14.0.0 or higher

Release checklist

If this pull request introduces backward incompatible changes, complete the following steps for a new release of the workflow:

  • Determine the version number for the new release by incrementing the most recent release (e.g., "v2" from "v1").
  • Update docs/src/reference/change_log.md in this pull request to document these changes and the new version number.
  • After merging, create a new GitHub release with the new version number as the tag and release title.

If this pull request introduces new features, complete the following steps:

  • Update docs/src/reference/change_log.md in this pull request to document these changes by the date they were added.

@corneliusroemer corneliusroemer requested a review from trvrb April 26, 2022 10:08
@corneliusroemer
Copy link
Member Author

@trvrb I've held back on merging this for a while because I wanted to let people have a chance to upgrade their ncov workflows to v14. I think now enough time has passed. Inherited clade definitions will make our lives a bit easier, see for example Omicron before and after:

Before:

21K (Omicron)	nuc	8782	C
21K (Omicron)	nuc	14408	T
21K (Omicron)	nuc	18163	G
21K (Omicron)	nuc	23403	G
21K (Omicron)	nuc	28881	A
21K (Omicron)	nuc	28882	A
21K (Omicron)	nuc	15240	T
21K (Omicron)	nuc	23202	A
21K (Omicron)	nuc	23525	T
21K (Omicron)	nuc	23599	G
21K (Omicron)	nuc	27259	C

21L (Omicron)	nuc	8782	C
21L (Omicron)	nuc	14408	T
21L (Omicron)	nuc	18163	G
21L (Omicron)	nuc	23403	G
21L (Omicron)	nuc	28881	A
21L (Omicron)	nuc	28882	A
21L (Omicron)	nuc	21618	T
21L (Omicron)	nuc	22775	A
21L (Omicron)	nuc	23599	G

21M (Omicron)	nuc	8782	C
21M (Omicron)	nuc	14408	T
21M (Omicron)	nuc	18163	G
21M (Omicron)	nuc	23403	G
21M (Omicron)	nuc	28881	A
21M (Omicron)	nuc	28882	A
21M (Omicron)	nuc	23599	G

After:

21K (Omicron)	clade	21M (Omicron)	
21K (Omicron)	nuc	15240	T
21K (Omicron)	nuc	23202	A
21K (Omicron)	nuc	23525	T
21K (Omicron)	nuc	27259	C

21L (Omicron)	clade	21M (Omicron)	
21L (Omicron)	nuc	21618	T
21L (Omicron)	nuc	22775	A

21M (Omicron)	clade	20B
21M (Omicron)	nuc	18163	G
21M (Omicron)	nuc	23599	G

I think it would make sense to test/merge this first before adding BA.2.12.1 - this should now reproduce just what the current clade definitions are.

@emmahodcroft
Copy link
Member

Just to be clear, this is backward-compatible, though right? If you haven't updated your clades.tsv file to include inheritance, and still do it longhand, it still works? I think that's the case but wanted to check.

@corneliusroemer
Copy link
Member Author

corneliusroemer commented Apr 27, 2022 via email

@corneliusroemer corneliusroemer marked this pull request as ready for review April 27, 2022 12:44
@trvrb
Copy link
Member

trvrb commented Apr 27, 2022

@corneliusroemer: Awesome! Thanks for this.

Can I ask that you generally spin out trial builds for testing purposes? You can do this by going to "Actions" then to "Rebuild GISAID phylogenetic datasets" then to "Run workflow" and select the branch of interest and type in this branch name as "short name" for trial build:

actions

I just did this here.

Edit:

Trial builds are available at:

Everything looks as it should.

@trvrb
Copy link
Member

trvrb commented Apr 27, 2022

Additionally, where do we specify minimum version requirements for the ncov workflow? This needs to be updated to be clear that Augur v14.0 is now required to run the workflow. However, I can't now find where this is documented / specified. cc @huddlej @victorlin

@victorlin
Copy link
Member

@trvrb: where do we specify minimum version requirements for the ncov workflow?

I think the closest thing is workflow/envs/nextstrain.yaml which specifies augur=15.0.0, but this file isn't recommended in the current setup steps which just point to the generic Nextstrain tools setup guide.

Maybe we could add a note on this new requirement in change_log.md for the next version v12? And we could specify minimum requirement of augur=15.0.0 if we want to document support for relative dates in the workflow.

@trvrb
Copy link
Member

trvrb commented Apr 27, 2022

Thanks @victorlin! And thanks again for the PR @corneliusroemer!

I believe we can just go ahead with merging this basically as is in this case. I'll just update the change log as needed.

@corneliusroemer
Copy link
Member Author

Thanks @trvrb for showing how to do test builds, that's super useful! Glad it all works as expected.

@trvrb trvrb merged commit 3661740 into master Apr 27, 2022
@trvrb trvrb deleted the feat/clades-inheritance branch April 27, 2022 23:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

4 participants