+
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- [#484](https://github.com/nf-core/taxprofiler/pull/484) Improved input validation to immediately fail if run accession IDs within a given sample ID are not unique (❤️ to @sofstam for reporting, fixed by @jfy133)
- [#491](https://github.com/nf-core/taxprofiler/pull/491) Added flag to publish intermediate bracken files (❤️ to @ewissel for reporting, fixed by @sofstam and @jfy133)
- [489](https://github.com/nf-core/taxprofiler/pull/489) Fix KrakenUniq classified reads output format mismatch (❤️ to @SannaAb for reporting, fixed by @jfy133)
- [#489](https://github.com/nf-core/taxprofiler/pull/489) Fix KrakenUniq classified reads output format mismatch (❤️ to @SannaAb for reporting, fixed by @jfy133)
- [#495](https://github.com/nf-core/taxprofiler/pull/495) Stop TAXPASTA failures when profiles do not have exact compositionality (fixes by @Midnighter, @jfy133)

### `Dependencies`

| Tool | Previous version | New version |
| ---- | ---------------- | ----------- |
| KMCP | 0.9.1 | 0.9.4 |
| Tool | Previous version | New version |
| -------- | ---------------- | ----------- |
| KMCP | 0.9.1 | 0.9.4 |
| TAXPASTA | 0.6.1 | 0.7.0 |

### `Deprecated`

Expand Down
18 changes: 9 additions & 9 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -754,15 +754,14 @@ process {

withName: TAXPASTA_MERGE {
tag = { "${meta.tool}|${meta.id}" }
ext.prefix = { "${meta.tool}_${meta.id}" }
ext.args = {
[
"-p ${meta.tool} -o ${meta.tool}_${meta.id}.${params.standardisation_taxpasta_format}",
params.taxpasta_add_name ? "--add-name" : "",
params.taxpasta_add_rank ? "--add-rank" : "",
params.taxpasta_add_lineage ? "--add-lineage" : "",
params.taxpasta_add_idlineage ? "--add-id-lineage" : "",
params.taxpasta_add_ranklineage ? "--add-rank-lineage" : "",
params.taxpasta_ignore_errors ? "--ignore-errors" : ""
].join(' ').trim()
}
publishDir = [
Expand All @@ -774,14 +773,15 @@ process {

withName: TAXPASTA_STANDARDISE {
tag = { "${meta.tool}|${meta.id}" }
ext.prefix = { "${meta.tool}_${meta.id}" }
ext.args = {
[
"-p ${meta.tool} -o ${meta.tool}_${meta.id}.${params.standardisation_taxpasta_format}",
params.taxpasta_add_name ? "--add-name" : "",
params.taxpasta_add_rank ? "--add-rank" : "",
params.taxpasta_add_lineage ? "--add-lineage" : "",
params.taxpasta_add_idlineage ? "--add-id-lineage" : ""
].join(' ').trim()
[
params.taxpasta_add_name ? "--add-name" : "",
params.taxpasta_add_rank ? "--add-rank" : "",
params.taxpasta_add_lineage ? "--add-lineage" : "",
params.taxpasta_add_idlineage ? "--add-id-lineage" : "",
params.taxpasta_add_ranklineage ? "--add-rank-lineage" : ""
].join(' ').trim()
}
publishDir = [
path: { "${params.outdir}/taxpasta/" },
Expand Down
4 changes: 2 additions & 2 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,12 @@
},
"taxpasta/merge": {
"branch": "master",
"git_sha": "48019785051ba491e82dce910273c2eca61bd5b7",
"git_sha": "4fd9089d3cf904e0b870d5a6a7ab903ee5e1004d",
"installed_by": ["modules"]
},
"taxpasta/standardise": {
"branch": "master",
"git_sha": "48019785051ba491e82dce910273c2eca61bd5b7",
"git_sha": "4fd9089d3cf904e0b870d5a6a7ab903ee5e1004d",
"installed_by": ["modules"]
},
"untar": {
Expand Down
7 changes: 7 additions & 0 deletions modules/nf-core/taxpasta/merge/environment.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 21 additions & 9 deletions modules/nf-core/taxpasta/merge/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 16 additions & 11 deletions modules/nf-core/taxpasta/merge/meta.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

111 changes: 111 additions & 0 deletions modules/nf-core/taxpasta/merge/tests/main.nf.test

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

83 changes: 83 additions & 0 deletions modules/nf-core/taxpasta/merge/tests/main.nf.test.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions modules/nf-core/taxpasta/merge/tests/tags.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载