millironx/taxprofiler
1
0
Fork 0
mirror of https://github.com/MillironX/taxprofiler.git synced 2024-12-03 16:59:55 +00:00
Code Issues Releases Packages Activity

Merge pull request #296 from nf-core/post-patch-update

Browse source 
Post patch update
This commit is contained in:
James A. Fellows Yates 2023-05-15 12:29:14 +02:00 committed by GitHub
commit 2fc6f8e3bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -30,6 +30,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### `Deprecated` ### `Deprecated`
## v1.0.1 - Dodgy Dachshund Patch [2023-05-15]
### `Added`
### `Fixed`
- [#291](https://github.com/nf-core/taxprofiler/pull/291) - Fix Taxpasta not receiving taxonomy directory (❤️ to @SannaAb for reporting, fix by @jfy133)
## v1.0.0 - Dodgy Dachshund [2023-03-13] ## v1.0.0 - Dodgy Dachshund [2023-03-13]
Initial release of nf-core/taxprofiler, created with the [nf-core](https://nf-co.re/) template. Initial release of nf-core/taxprofiler, created with the [nf-core](https://nf-co.re/) template.

2
README.md
View file

@ -1,6 +1,6 @@
# ![nf-core/taxprofiler](docs/images/nf-core-taxprofiler_logo_custom_light.png#gh-light-mode-only) ![nf-core/taxprofiler](docs/images/nf-core-taxprofiler_logo_custom_dark.png#gh-dark-mode-only) # ![nf-core/taxprofiler](docs/images/nf-core-taxprofiler_logo_custom_light.png#gh-light-mode-only) ![nf-core/taxprofiler](docs/images/nf-core-taxprofiler_logo_custom_dark.png#gh-dark-mode-only)
[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/taxprofiler/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.XXXXXXX-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.XXXXXXX) [![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/taxprofiler/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.7728364-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.7728364)
[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A522.10.1-23aa62.svg)](https://www.nextflow.io/) [![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A522.10.1-23aa62.svg)](https://www.nextflow.io/)
[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/) [![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)

1
conf/modules.config
View file

@ -641,7 +641,6 @@ process {
ext.args = { ext.args = {
[ [
"-p ${meta.tool} -o ${meta.tool}_${meta.id}.${params.standardisation_taxpasta_format}", "-p ${meta.tool} -o ${meta.tool}_${meta.id}.${params.standardisation_taxpasta_format}",
params.taxpasta_taxonomy_dir ? "--taxonomy ${params.taxpasta_taxonomy_dir}" : "",
params.taxpasta_add_name ? "--add-name" : "", params.taxpasta_add_name ? "--add-name" : "",
params.taxpasta_add_rank ? "--add-rank" : "", params.taxpasta_add_rank ? "--add-rank" : "",
params.taxpasta_add_lineage ? "--add-lineage" : "", params.taxpasta_add_lineage ? "--add-lineage" : "",

5
lib/WorkflowMain.groovy
View file

@ -11,9 +11,8 @@ class WorkflowMain {
// //
public static String citation(workflow) { public static String citation(workflow) {
return "If you use ${workflow.manifest.name} for your analysis please cite:\n\n" + return "If you use ${workflow.manifest.name} for your analysis please cite:\n\n" +
// TODO nf-core: Add Zenodo DOI for pipeline after first release "* The pipeline\n" +
//"* The pipeline\n" + " https://doi.org/10.5281/zenodo.7728364\n\n" +
//" https://doi.org/10.5281/zenodo.XXXXXXX\n\n" +
'* The nf-core framework\n' + '* The nf-core framework\n' +
' https://doi.org/10.1038/s41587-020-0439-x\n\n' + ' https://doi.org/10.1038/s41587-020-0439-x\n\n' +
'* Software dependencies\n' + '* Software dependencies\n' +

2
nextflow.config
View file

@ -336,7 +336,7 @@ manifest {
mainScript = 'main.nf' mainScript = 'main.nf'
nextflowVersion = '!>=22.10.1' nextflowVersion = '!>=22.10.1'
version = '1.1.0dev' version = '1.1.0dev'
doi = '' doi = '10.5281/zenodo.7728364'
} }
// Load modules.config for DSL2 module specific options // Load modules.config for DSL2 module specific options

4
subworkflows/local/standardisation_profiles.nf
View file

@ -33,7 +33,9 @@ workflow STANDARDISATION_PROFILES {
.groupTuple () .groupTuple ()
.map { [ it[0], it[1].flatten() ] } .map { [ it[0], it[1].flatten() ] }
TAXPASTA_MERGE (ch_input_for_taxpasta, [], []) ch_taxpasta_tax_dir = params.taxpasta_taxonomy_dir ? Channel.fromPath(params.taxpasta_taxonomy_dir, checkIfExists: true).collect() : []
TAXPASTA_MERGE (ch_input_for_taxpasta, ch_taxpasta_tax_dir, [])
/* /*
Split profile results based on tool they come from Split profile results based on tool they come from