-
Notifications
You must be signed in to change notification settings - Fork 11
Add DIAMOND blastp subworkflow for protein homology search against NCBI RefSeq #50
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
tracelail
wants to merge
55
commits into
nf-core:dev
Choose a base branch
from
tracelail:unfinished-diamond-blastp
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 22 commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
53aa47c
Install diamond/blastp
eweizy 55b7632
Unfinished diamond/blastp integraton
eweizy 3c5b661
Add diamond
eweizy b1fdc74
reinstalled diamond/blastp module. Installed blast/makeblastdb
tracelail 9f1ea67
wrote draft integration of BLAST_MAKEBLASTDB and NCBIREFSEQDOWNLOAD i…
tracelail 52506f7
installed diamond makedb
tracelail 49ee17c
cleared nf-test logs and added tuple output for main.nf.test of diam…
tracelail 6ab82f3
Merge branch 'dev' of https://github.com/tracelail/proteinannotator i…
tracelail 89fb03e
Merge branch 'dev' of https://github.com/nf-core/proteinannotator int…
tracelail f12c619
removed blast/makeblastdb nf-core module and create local diamondprep…
tracelail 4f4db82
finished up writing the ncbirefseqdownload process for the first draf…
tracelail 3946ba5
edited ncbirefseqdownload script to a working stated where the nf-tes…
tracelail 94ebe1b
created a working ncbirefseqdownload module with basic nf-test. Also …
tracelail 06bf5e8
added more working tests to ncbirefseqdownload and organized.
tracelail 7681f82
Added diamondpreparetaxa main.nf script and a process.success nf-test.
tracelail 0cf27f7
Merge branch 'dev' into unfinished-diamond-blastp
tracelail 92c847c
added working snapshot assertions for process.out match and versions …
tracelail 043451f
Added output documentation for all seven Diamond subworkflow outputs.
tracelail f59c0b7
wrote a potential subworkflow for diamond as well as a test. Copied t…
tracelail cf259d3
added stub portion to ncbirefseqdownload. Added all output emits to d…
tracelail 9fd5d3f
Added stub section to diamondpreparetaxa module.
tracelail fa390ce
created a simple flow diagram of the diamond subworkflow and it's mod…
tracelail 4eb5ad1
Apply suggestions from code review
tracelail 71ff9ef
Created workflow success tests for diamond subworkflow. Added nextflo…
tracelail a4f00be
Merge branch 'dev' of https://github.com/nf-core/proteinannotator int…
tracelail 16e10b2
Merge remote-tracking branch 'refs/remotes/origin/unfinished-diamond-…
tracelail c970041
corrected typo in diamondpreparetaxa container
tracelail 925ed89
updated diamond/makedb module
tracelail 7b8a6e1
removed params.diamond_blast_columns = 'qseqid' to resolve testing co…
tracelail 1f5ba7a
updated nf-core module diamond/blastp to match diamond/makedb
tracelail 8edc405
working subworkflow nf-test with large prot.accession2taxid.gz taxonmap.
tracelail a3e661c
Updated diamond subworkflow main.nf.test with a smaller taxonmap for …
tracelail 3fbcc6a
created a local diamond subworkflow that produces a diamond/blastp ou…
tracelail a4911fc
Added example outputs for DIAMOND subworkflow. Added default paramete…
tracelail 64ed6dc
Added usage documentation for DIAMOND subworkflow.
tracelail 556b3e3
Updated nextflow_schema and readme.
tracelail f5b63c2
minimal label edit to functional annotation workflow.
tracelail 6cd3a20
updated nextflow_schema and nextflow.config
tracelail 3ffbc1a
changed diamond_blast_columns values to null for string inputs
tracelail 0b1df66
added meta.yml info and some tags for functional annotation subworkflow
tracelail 2257719
made stub updates to diamondpreparetaxa and ncbirefseqdownload and ad…
tracelail 7632328
Addeded diamond_blast_columns = "" back as being null caused issues. …
tracelail c1f0c63
deleted interproscan functional annotation subworkflow tests to remov…
tracelail b58e6f2
manually resolved functional_annotation test merge preparation
tracelail 2041cfc
Merge branch 'dev' into unfinished-diamond-blastp
tracelail 4dcba98
updated missed merge conflict
tracelail 6a39985
minor updates for cleaning and future version implementation in local…
tracelail 8dfc3ea
Updated modules.json to remove mmseqs/search that would break. Can be…
tracelail 0c9ba7d
Addressed some liniting issues in modules and schema json
tracelail 60e36fa
Updated schema and config to fix lint error. Updated readme with diam…
tracelail a2e2c02
diamond subworkflow needed a default with elvis operator and the diam…
tracelail ac1a9c8
updated diamond nf-core modules
tracelail 9a7dace
Diamond modules update had new versioning. Removed old version emit c…
tracelail 67617ad
updated resolution conflicts
tracelail 63facff
Merge branch 'dev' into unfinished-diamond-blastp
tracelail 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 |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| Jul-09 09:36:15.278 [main] INFO com.askimed.nf.test.App - nf-test 0.9.2 | ||
| Jul-09 09:36:15.294 [main] INFO com.askimed.nf.test.App - Arguments: [test, subworkflows/local/diamond/tests/main.nf.tests] | ||
| Jul-09 09:36:16.153 [main] INFO com.askimed.nf.test.App - Nextflow Version: 24.10.6 | ||
| Jul-09 09:36:16.155 [main] INFO com.askimed.nf.test.commands.RunTestsCommand - Load config from file /home/trace/projects/proteinannotator/nf-test.config... | ||
| Jul-09 09:36:16.663 [main] WARN com.askimed.nf.test.nextflow.NextflowScript - Module /home/trace/projects/proteinannotator/subworkflows/local/functional_annotation/main.nf: Dependency '/home/trace/projects/proteinannotator/subworkflows/local/functional_annotation/../../../modules/nf-core/blast/makeblastdb/main.nf' not found. | ||
| Jul-09 09:36:16.728 [main] INFO com.askimed.nf.test.lang.dependencies.DependencyResolver - Loaded 21 files from directory /home/trace/projects/proteinannotator in 0.081 sec | ||
| Jul-09 09:36:16.730 [main] INFO com.askimed.nf.test.lang.dependencies.DependencyResolver - Found 0 files containing tests. | ||
| Jul-09 09:36:16.730 [main] DEBUG com.askimed.nf.test.lang.dependencies.DependencyResolver - Found files: [] | ||
| Jul-09 09:36:16.732 [main] INFO com.askimed.nf.test.commands.RunTestsCommand - Found 0 tests to execute. |
|
olgabot marked this conversation as resolved.
|
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,6 @@ | ||
| { | ||
| "markdown.styles": ["public/vscode_markdown.css"] | ||
| "markdown.styles": [ | ||
| "public/vscode_markdown.css" | ||
| ], | ||
| "nextflow.telemetry.enabled": true | ||
| } |
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
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
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,10 @@ | ||
| --- | ||
| # yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json | ||
| channels: | ||
| - conda-forge | ||
| - bioconda | ||
| dependencies: | ||
| # TODO nf-core: List required Conda package(s). | ||
| # Software MUST be pinned to channel (i.e. "bioconda"), version (i.e. "1.10"). | ||
| # For Conda, the build (i.e. "h9402c20_2") must be EXCLUDED to support installation on different operating systems. | ||
| - "YOUR-TOOL-HERE" | ||
|
tracelail marked this conversation as resolved.
|
||
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,57 @@ | ||
| process DIAMONDPREPARETAXA { | ||
|
|
||
| // tag "${taxondmp_zip.baseName}" | ||
| label 'process_low' | ||
|
|
||
| conda "${moduleDir}/environment.yml" | ||
| container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? | ||
| 'https://depot.galaxyproject.org/singularity/YOUR-TOOL-HERE': | ||
|
olgabot marked this conversation as resolved.
Outdated
tracelail marked this conversation as resolved.
Outdated
|
||
| 'biocontainers/YOUR-TOOL-HERE' }" | ||
|
|
||
| // write the output files to a user specified directory via an input parameter | ||
| // publishDir "${params.outdir}/ncbi_refseq/", mode: 'copy' | ||
|
|
||
| input: | ||
| val taxondmp_zip // Add default of ftp://ftp.ncbi.nih.gov/pub/taxonomy/taxdump.tar.gz | ||
|
|
||
| output: | ||
| path("taxa/nodes.dmp"), emit: taxonnodes | ||
| path("taxa/names.dmp"), emit: taxonnames | ||
| path "versions.yml" , emit: versions | ||
|
|
||
| when: | ||
| task.ext.when == null || task.ext.when | ||
|
|
||
| script: | ||
| def args = task.ext.args ?: '' | ||
| // def prefix = task.ext.prefix ?: "${meta.id}" | ||
| // Omitting from script portion for now | ||
| // # $args \\ | ||
| // # -@ $task.cpus \\ | ||
| // # -o ${prefix}.bam \\ | ||
|
|
||
| """ | ||
| mkdir -p taxa/ | ||
| wget -q ${taxondmp_zip} | ||
| tar -xzf taxdump.tar.gz -C taxa | ||
|
|
||
| cat <<-END_VERSIONS > versions.yml | ||
| "${task.process}": | ||
| diamondpreparetaxa: \$(diamondpreparetaxa --version) | ||
| END_VERSIONS | ||
| """ | ||
|
|
||
| stub: | ||
| // def args = task.ext.args ?: '' | ||
| // def prefix = task.ext.prefix ?: "${meta.id}" | ||
| """ | ||
|
|
||
|
tracelail marked this conversation as resolved.
Outdated
|
||
| touch taxa/nodes.dmp | ||
| touch taxa/names.dmp | ||
|
|
||
| cat <<-END_VERSIONS > versions.yml | ||
| "${task.process}": | ||
| diamondpreparetaxa: \$(diamondpreparetaxa --version) | ||
| END_VERSIONS | ||
| """ | ||
| } | ||
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,68 @@ | ||
| --- | ||
| # yaml-language-server: $schema=https://raw.githubusercontent.com/nf-core/modules/master/modules/meta-schema.json | ||
| name: "diamondpreparetaxa" | ||
| ## TODO nf-core: Add a description of the module and list keywords | ||
| description: write your description here | ||
| keywords: | ||
| - sort | ||
| - example | ||
| - genomics | ||
| tools: | ||
| - "diamondpreparetaxa": | ||
| ## TODO nf-core: Add a description and other details for the software below | ||
| description: "" | ||
| homepage: "" | ||
| documentation: "" | ||
| tool_dev_url: "" | ||
| doi: "" | ||
| licence: | ||
| identifier: | ||
|
|
||
| ## TODO nf-core: Add a description of all of the variables used as input | ||
| input: | ||
| # Only when we have meta | ||
| - - meta: | ||
| type: map | ||
| description: | | ||
| Groovy Map containing sample information | ||
| e.g. `[ id:'sample1' ]` | ||
|
|
||
| ## TODO nf-core: Delete / customise this example input | ||
| - bam: | ||
| type: file | ||
| description: Sorted BAM/CRAM/SAM file | ||
| pattern: "*.{bam,cram,sam}" | ||
| ontologies: | ||
| - edam: "http://edamontology.org/format_2572" # BAM | ||
| - edam: "http://edamontology.org/format_2573" # CRAM | ||
| - edam: "http://edamontology.org/format_3462" # SAM | ||
|
|
||
| ## TODO nf-core: Add a description of all of the variables used as output | ||
| output: | ||
| - bam: | ||
| #Only when we have meta | ||
| - meta: | ||
| type: map | ||
| description: | | ||
| Groovy Map containing sample information | ||
| e.g. `[ id:'sample1' ]` | ||
| ## TODO nf-core: Delete / customise this example output | ||
| - "*.bam": | ||
| type: file | ||
| description: Sorted BAM/CRAM/SAM file | ||
| pattern: "*.{bam,cram,sam}" | ||
| ontologies: | ||
| - edam: "http://edamontology.org/format_2572" # BAM | ||
| - edam: "http://edamontology.org/format_2573" # CRAM | ||
| - edam: "http://edamontology.org/format_3462" # SAM | ||
|
|
||
| - versions: | ||
| - "versions.yml": | ||
| type: file | ||
| description: File containing software versions | ||
| pattern: "versions.yml" | ||
|
|
||
| authors: | ||
| - "@tracelail" | ||
| maintainers: | ||
| - "@tracelail" |
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.