Skip to content

Commit

Permalink
Merge pull request #41 from nextstrain/misc-tpyoes
Browse files Browse the repository at this point in the history
Misc tpyoes
  • Loading branch information
genehack authored May 16, 2024
2 parents 6e9e77b + 64d8313 commit f33c43e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@

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.
the outputs of the workflows. See the [changelog for the ncov
repository](https://github.com/nextstrain/ncov/blob/HEAD/docs/src/reference/change_log.md)
for an example of formatting.
14 changes: 7 additions & 7 deletions ingest/Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ configfile: "defaults/config.yaml"

# This is the default rule that Snakemake will run when there are no specified targets.
# The default output of the ingest workflow is usually the curated metadata and sequences.
# Nextstrain maintained ingest workflows will produce metadata files with the
# Nextstrain-maintained ingest workflows will produce metadata files with the
# standard Nextstrain fields and additional fields that are pathogen specific.
# We recommend use these standard fields in custom ingests as well to minimize
# We recommend using these standard fields in custom ingests as well to minimize
# the customizations you will need for the downstream phylogenetic workflow.
# TODO: Add link to centralized docs on standard Nextstrain metadata fields
rule all:
Expand All @@ -21,18 +21,18 @@ rule all:
"results/metadata.tsv",


# Note that only PATHOGEN level customizations should be added to these
# Note that only PATHOGEN-level customizations should be added to these
# core steps, meaning they are custom rules necessary for all builds of the pathogen.
# If there are build specific customizations, they should be added with the
# If there are build-specific customizations, they should be added with the
# custom_rules imported below to ensure that the core workflow is not complicated
# by build specific rules.
# by build-specific rules.
include: "rules/fetch_from_ncbi.smk"
include: "rules/curate.smk"


# We are pushing to standardize ingest workflows with Nextclade runs to include
# Nextclade outputs in our publicly hosted data. However, if a Nextclade dataset
# does not already exist, it requires curated data as input, so we are making
# does not already exist, creating one requires curated data as input, so we are making
# Nextclade steps optional here.
#
# If Nextclade config values are included, the nextclade rules will create the
Expand Down Expand Up @@ -60,7 +60,7 @@ else:
# Allow users to import custom rules provided via the config.
# This allows users to run custom rules that can extend or override the workflow.
# A concrete example of using custom rules is the extension of the workflow with
# rules to support the Nextstrain automation that upload files and send internal
# rules to support the Nextstrain automation that uploads files and sends internal
# Slack notifications.
# For extensions, the user will have to specify the custom rule targets when
# running the workflow.
Expand Down
2 changes: 1 addition & 1 deletion ingest/defaults/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ entrez_search_term: ""
ncbi_taxon_id: ""

# The list of NCBI Datasets fields to include from NCBI Datasets output
# These need to be the mneumonics of the NCBI Datasets fields, see docs for full list of fields
# These need to be the "mnemonics" of the NCBI Datasets fields, see docs for full list of fields
# https://www.ncbi.nlm.nih.gov/datasets/docs/v2/reference-docs/command-line/dataformat/tsv/dataformat_tsv_virus-genome/#fields
# Note: the "accession" field MUST be provided to match with the sequences
ncbi_datasets_fields:
Expand Down
2 changes: 1 addition & 1 deletion ingest/rules/fetch_from_ncbi.smk
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ to provide the correct parameter.
"""

# This ruleorder determines which rule to use to produce the final NCBI NDJSON file.
# The default is set to use NCBI Datasets since it does no require a custom script.
# The default is set to use NCBI Datasets since it does not require a custom script.
# Switch the rule order if you plan to use Entrez
ruleorder: format_ncbi_datasets_ndjson > parse_genbank_to_ndjson

Expand Down
4 changes: 2 additions & 2 deletions phylogenetic/Snakefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""
This is the main phylogenetic Snakefile that orchestrates the full phylogenetic
workflow and define its default output(s).
workflow and defines its default output(s).
"""
# The workflow filepaths are written relative to this Snakefile's base directory
workdir: workflow.current_basedir
Expand All @@ -11,7 +11,7 @@ configfile: "defaults/config.yaml"

# This is the default rule that Snakemake will run when there are no specified targets.
# The default output of the phylogenetic workflow is usually the final
# Nexstrain dataset(s) or Auspice JSON(s) that is output from `rules/export.smk`
# Nexstrain dataset(s) or Auspice JSON(s) that are output from `rules/export.smk`
# See Nextstrain docs on expected naming conventions of dataset files
# https://docs.nextstrain.org/page/reference/data-formats.html
rule all:
Expand Down

0 comments on commit f33c43e

Please sign in to comment.