Skip to content
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

Zip ampcombi #243

Merged
merged 7 commits into from
Mar 20, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### `Fixed`

- [#243](https://github.com/nf-core/funcscan/pull/243) Compress the ampcombi_complete_summary.csv in the output directory (by @louperelo)
- [#237](https://github.com/nf-core/funcscan/pull/237) Reactivate DeepARG automatic database downloading and CI tests as server is now back up. (by @jfy133)

### `Dependencies`
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) Jasmin Frangenberg, Anan Ibrahim, James A. Fellows Yates
Copyright (c) Jasmin Frangenberg, Anan Ibrahim, Louisa Perelo, Moritz E. Beber, James A. Fellows Yates

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 8 additions & 0 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,14 @@ process {
ext.args = "--tooldict '${ext.tooldict}' --cutoff ${params.amp_ampcombi_cutoff}"
}

withName: TABIX_BGZIP {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs a pattern?

publishDir = [
path: { "${params.outdir}/reports/ampcombi" },
mode: params.publish_dir_mode,
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
]
}

withName: COMBGC {
publishDir = [
path: { "${params.outdir}/reports/combgc" },
Expand Down
2 changes: 1 addition & 1 deletion docs/output.md
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ Output Summaries:
<summary>Output files</summary>

- `ampcombi/`
- `ampcombi_complete_summary.csv`: summarised output from all AMP workflow tools (except hmmer_hmmsearch) in csv format
- `ampcombi_complete_summary.csv.gz`: summarised output from all AMP workflow tools (except hmmer_hmmsearch) in compressed csv format
- `ampcombi.log`: a log file generated by ampcombi
- `*_ampcombi.csv`: summarised output in csv for each sample
- `*_amp.faa*`: fasta file containing the amino acid sequences for all AMP hits for each sample
Expand Down
5 changes: 5 additions & 0 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,11 @@
"git_sha": "c8e35eb2055c099720a75538d1b8adb3fb5a464c",
"installed_by": ["modules"]
},
"tabix/bgzip": {
"branch": "master",
"git_sha": "90294980a903ecebd99ac31d8b6c66af48fa8259",
"installed_by": ["modules"]
},
"untar": {
"branch": "master",
"git_sha": "cc1f997fab6d8fde5dc0e6e2a310814df5b53ce7",
Expand Down
54 changes: 54 additions & 0 deletions modules/nf-core/tabix/bgzip/main.nf

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

47 changes: 47 additions & 0 deletions modules/nf-core/tabix/bgzip/meta.yml

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

2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ dag {

manifest {
name = 'nf-core/funcscan'
author = """Jasmin Frangenberg, Anan Ibrahim, James A. Fellows Yates"""
author = """Jasmin Frangenberg, Anan Ibrahim, Louisa Perelo, Moritz E. Beber, James A. Fellows Yates"""
homePage = 'https://github.com/nf-core/funcscan'
description = """Pipeline for screening for functional components of assembled contigs"""
mainScript = 'main.nf'
Expand Down
8 changes: 7 additions & 1 deletion subworkflows/local/amp.nf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ include { AMPLIFY_PREDICT } from '../.
include { AMPIR } from '../../modules/nf-core/ampir/main'
include { AMPCOMBI } from '../../modules/nf-core/ampcombi/main'
include { GUNZIP as GUNZIP_MACREL ; GUNZIP as GUNZIP_HMMER } from '../../modules/nf-core/gunzip/main'
include { TABIX_BGZIP } from '../../modules/nf-core/tabix/bgzip/main'


workflow AMP {
take:
Expand Down Expand Up @@ -96,7 +98,11 @@ workflow AMP {
input: [ it[0] ]
summary: it[1]
}
ch_ampcombi_summaries_out.summary.collectFile(name: 'ampcombi_complete_summary.csv', storeDir: "${params.outdir}/reports/ampcombi", keepHeader:true)

ch_tabix_input = Channel.of(['id':'ampcombi_complete_summary'])
.combine(ch_ampcombi_summaries_out.summary.collectFile(name: 'ampcombi_complete_summary.csv', keepHeader:true))

TABIX_BGZIP(ch_tabix_input)

emit:
versions = ch_versions
Expand Down