-
Notifications
You must be signed in to change notification settings - Fork 8
Use augur subsample #103
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
Open
Open
Use augur subsample #103
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
f154019
Configuration schema and validation
victorlin ac456a6
Add separate config section for filter_for_pre_subsample_alignment
victorlin 494f760
Use augur subsample
victorlin 14ed05d
Generate default config YAML
victorlin 12efdc8
Rename rule to filter_for_f_antibody_escape
victorlin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,8 @@ | ||
| # Allow Git to decide if file is text or binary | ||
| # Always use LF line endings even on Windows. | ||
| * text=auto eol=lf | ||
|
|
||
| # This is a large generated file that, while text, it is not useful to | ||
| # routinely show the diff of. A diff can be forced as needed, e.g. with `git | ||
| # diff --text`. | ||
| /config/configfile.yaml -diff | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,9 @@ | ||
| # CHANGELOG | ||
|
|
||
| We use this CHANGELOG to document breaking changes, new features, bug fixes, and config value changes that may affect both the usage of the workflows and the outputs of the workflows. | ||
|
|
||
| ## 2026 | ||
|
|
||
| * TBD: The `filter` section in phylogenetic workflow configuration has been replaced by `subsample`/`custom_subsample` for subsampling, and `filter_for_f_antibody_escape` for initial quality filtering. **This is a breaking change**. | ||
| * NOTE: The workflow does not yet support proximal samples. | ||
| * TBD: Phylogenetic workflow configuration is now validated against a strict schema. The workflow will error if your configuration has extraneous entries that were previously ignored. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,227 @@ | ||
| $schema: "https://json-schema.org/draft/2020-12/schema" | ||
| title: RSV Phylogenetic Workflow Configuration | ||
| description: >- | ||
| This is the schema for the Nextstrain rsv phylogenetic workflow's | ||
| configuration file. | ||
|
|
||
| $defs: | ||
| per_full_build_map: &per_full_build_map | ||
| type: object | ||
| additionalProperties: false | ||
| propertyNames: | ||
| title: Full build name | ||
| description: Full build name (e.g. 'a/genome/all-time') | ||
|
|
||
| per_subtype_map: &per_subtype_map | ||
| type: object | ||
| additionalProperties: false | ||
| propertyNames: | ||
| title: Subtype | ||
| description: Subtype ('a' or 'b') | ||
|
|
||
| per_build_map: &per_build_map | ||
| type: object | ||
| additionalProperties: false | ||
| propertyNames: | ||
| title: Build name | ||
| description: Build name ('genome', 'G', 'F', or 'F-antibody-escape') | ||
|
|
||
| per_resolution_map: &per_resolution_map | ||
| type: object | ||
| additionalProperties: false | ||
| propertyNames: | ||
| title: Resolution name | ||
| description: Resolution name ('all-time', '6y', or '3y') | ||
|
|
||
| input_item: | ||
| type: object | ||
| additionalProperties: false | ||
| required: | ||
| - name | ||
| anyOf: | ||
| - required: [metadata] | ||
| - required: [sequences] | ||
| properties: | ||
| name: | ||
| type: string | ||
| metadata: | ||
| type: string | ||
| sequences: | ||
| type: string | ||
|
|
||
| type: object | ||
| additionalProperties: false | ||
| properties: | ||
| conda_environment: | ||
| type: string | ||
| genesforglycosylation: | ||
| type: array | ||
| items: | ||
| type: string | ||
| builds_to_run: | ||
| type: array | ||
| items: | ||
| type: string | ||
| resolutions_to_run: | ||
| type: array | ||
| items: | ||
| type: string | ||
| subtypes: | ||
| type: array | ||
| items: | ||
| type: string | ||
| inputs: | ||
| type: array | ||
| items: | ||
| $ref: "#/$defs/input_item" | ||
| additional_inputs: | ||
| type: array | ||
| items: | ||
| $ref: "#/$defs/input_item" | ||
| exclude: | ||
| type: string | ||
| description: | ||
| type: string | ||
| strain_id_field: | ||
| type: string | ||
| display_strain_field: | ||
| type: string | ||
| subsample: &subsample_config | ||
| <<: *per_full_build_map | ||
| description: >- | ||
| Subsampling configuration. When using --configfile, it is recommended to | ||
| use 'custom_subsample' instead to ignore default subsampling configuration. | ||
| patternProperties: | ||
| "^.*$": | ||
| $ref: "https://nextstrain.org/schemas/augur/subsample-config/v1#/$defs/schemaForUnalignedSequences" | ||
| custom_subsample: | ||
| <<: *subsample_config | ||
| description: >- | ||
| Custom subsampling configuration. When using --configfile, this is | ||
| recommended over 'subsample' to ignore default subsampling configuration. | ||
| files: | ||
| type: object | ||
| additionalProperties: false | ||
| properties: | ||
| auspice_config: | ||
| type: string | ||
| auspice_config_additional_colorings: | ||
| type: string | ||
| auspice_config_f_antibody_escape: | ||
| type: string | ||
| auspice_config_non-genome_builds: | ||
| type: string | ||
| refine: | ||
| type: object | ||
| additionalProperties: false | ||
| properties: | ||
| coalescent: | ||
| type: string | ||
| date_inference: | ||
| type: string | ||
| clock_filter_iqd: | ||
| type: number | ||
| divergence_units: | ||
| type: string | ||
| ancestral: | ||
| type: object | ||
| additionalProperties: false | ||
| properties: | ||
| inference: | ||
| type: string | ||
| cds: | ||
| <<: *per_build_map | ||
| patternProperties: | ||
| "^.*$": | ||
| type: string | ||
| traits: | ||
| type: object | ||
| additionalProperties: false | ||
| properties: | ||
| columns: | ||
| type: [string, array] | ||
| items: | ||
| type: string | ||
| frequencies: | ||
| type: object | ||
| additionalProperties: false | ||
| properties: | ||
| resolutions: | ||
| <<: *per_resolution_map | ||
| patternProperties: | ||
| "^.*$": | ||
| type: object | ||
| additionalProperties: false | ||
| properties: | ||
| min_date: | ||
| type: string | ||
| nextclade_attributes: | ||
| <<: *per_subtype_map | ||
| patternProperties: | ||
| "^.*$": | ||
| type: object | ||
| additionalProperties: false | ||
| properties: | ||
| name: | ||
| type: string | ||
| reference_name: | ||
| type: string | ||
| accession: | ||
| type: string | ||
| filter_for_f_antibody_escape: | ||
| type: object | ||
| additionalProperties: false | ||
| properties: | ||
| group_by: | ||
| type: string | ||
| min_length: | ||
| <<: *per_build_map | ||
| patternProperties: | ||
| "^.*$": | ||
| type: integer | ||
| min_coverage: | ||
| <<: *per_build_map | ||
| patternProperties: | ||
| "^.*$": | ||
| type: number | ||
| resolutions: | ||
| <<: *per_resolution_map | ||
| patternProperties: | ||
| "^.*$": | ||
| type: object | ||
| additionalProperties: false | ||
| properties: | ||
| min_date: | ||
| type: string | ||
| background_min_date: | ||
| type: string | ||
| f_dms_data: | ||
| type: string | ||
| f_dms_antibodies: | ||
| type: array | ||
| items: | ||
| type: string | ||
| dms_only_positive_escape: | ||
| type: boolean | ||
| enrich_antibody_escape: | ||
| <<: *per_build_map | ||
| patternProperties: | ||
| "^.*$": | ||
| type: object | ||
| additionalProperties: false | ||
| properties: | ||
| nseqs_per_antibody_scoretype: | ||
| type: integer | ||
| group_by: | ||
| type: array | ||
| items: | ||
| type: string | ||
| max_identical_f_prot_muts: | ||
| type: integer | ||
| max_identical_max_escape_mut: | ||
| type: integer | ||
| custom_rules: | ||
| type: array | ||
| description: Custom Snakemake rule files to include. If used, this will disable config schema validation. | ||
| items: | ||
| type: string |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.