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

dysgu_updated #5817

Closed
wants to merge 72 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
9638a8b
dysgu_updated
poddarharsh15 Jun 17, 2024
f00c005
main.nf updated
poddarharsh15 Jun 17, 2024
293bf7a
meta.yml_update
poddarharsh15 Jun 17, 2024
881f4ad
Update modules/nf-core/dysgu/main.nf
poddarharsh15 Jun 17, 2024
cc70f48
Update modules/nf-core/dysgu/meta.yml
poddarharsh15 Jun 17, 2024
3ad528f
Update modules/nf-core/dysgu/main.nf
poddarharsh15 Jun 17, 2024
f3523b7
Update modules/nf-core/dysgu/main.nf
poddarharsh15 Jun 17, 2024
41e0ca6
main.nf_TODO_removed
poddarharsh15 Jun 18, 2024
f701efd
Update modules/nf-core/dysgu/main.nf
poddarharsh15 Jun 18, 2024
769b1e3
Update modules/nf-core/dysgu/main.nf
poddarharsh15 Jun 18, 2024
5f527d9
Update modules/nf-core/dysgu/main.nf
poddarharsh15 Jun 18, 2024
fbd78fa
Update modules/nf-core/dysgu/main.nf
poddarharsh15 Jun 18, 2024
8cef393
Update modules/nf-core/dysgu/main.nf
poddarharsh15 Jun 18, 2024
e3415a5
chnaged_meta:sample1
poddarharsh15 Jun 18, 2024
b5e3ac9
prettier -w changes
poddarharsh15 Jun 19, 2024
55e4798
Update modules/nf-core/dysgu/tests/main.nf.test
poddarharsh15 Jun 19, 2024
d10e6d2
removed_TODO
poddarharsh15 Jun 19, 2024
d555e2f
editor.config_changes
poddarharsh15 Jun 19, 2024
779f7ab
Merge branch 'master' into master
famosab Jun 19, 2024
30a67df
fix whitespace for ECLint
famosab Jun 19, 2024
f9cd688
nextflow.config_update
poddarharsh15 Jun 20, 2024
4ae8c45
remove_TODO
poddarharsh15 Jun 20, 2024
ac16c87
update_config
poddarharsh15 Jun 20, 2024
1b0a9ec
meta_chnage,temp param chnaged
poddarharsh15 Jun 21, 2024
c95ee98
modify_asserts
poddarharsh15 Jun 21, 2024
2e9d59f
-vcf_index meta.yml
poddarharsh15 Jun 21, 2024
0510e9e
tbi_updated
poddarharsh15 Jun 21, 2024
fc69f00
removed
poddarharsh15 Jun 21, 2024
34597b1
input_added
poddarharsh15 Jun 21, 2024
e34f5fe
Update modules/nf-core/dysgu/main.nf
poddarharsh15 Jun 21, 2024
2572ace
Update modules/nf-core/dysgu/main.nf
poddarharsh15 Jun 21, 2024
e75fcf0
Update modules/nf-core/dysgu/tests/main.nf.test
poddarharsh15 Jun 21, 2024
248d82c
input_1
poddarharsh15 Jun 21, 2024
af228ac
meta2
poddarharsh15 Jun 21, 2024
03d1335
todo_remove
poddarharsh15 Jun 21, 2024
9237a3f
feat: add snap file, correct syntax
famosab Jun 21, 2024
e663a81
fix: syntax, add author
famosab Jun 21, 2024
66bb27c
Merge branch 'master' into master
famosab Jun 21, 2024
b9786b2
fix: tests
famosab Jun 21, 2024
244018c
cram test and fix formatting
famosab Jun 21, 2024
56950ae
redo snap
famosab Jun 21, 2024
ad8d9df
Update modules/nf-core/dysgu/tests/main.nf.test
poddarharsh15 Jun 24, 2024
3e7277a
Update modules/nf-core/dysgu/tests/main.nf.test
poddarharsh15 Jun 24, 2024
28fde1b
Update modules/nf-core/dysgu/main.nf --mkdir temp
poddarharsh15 Jun 24, 2024
71a3d16
main.nf.test.sanp update
poddarharsh15 Jun 24, 2024
b525810
Merge branch 'master' into master
famosab Jun 24, 2024
a244b1f
--temp_update
poddarharsh15 Jun 24, 2024
0d2865f
temp_update
poddarharsh15 Jun 24, 2024
5630201
add--rundir_p4
poddarharsh15 Jun 25, 2024
953dbef
removed--runDir
poddarharsh15 Jun 25, 2024
cc5ba98
Update modules/nf-core/dysgu/main.nf
poddarharsh15 Jun 25, 2024
a02e2e4
updated_main.nf
poddarharsh15 Jun 25, 2024
9811989
uddated_main.nf
poddarharsh15 Jun 25, 2024
3293199
updated -x(overwrite any temp files)
poddarharsh15 Jun 25, 2024
789d7b5
updated_main.nf-x
poddarharsh15 Jun 25, 2024
00ca3f2
updating_ref_genome
poddarharsh15 Jun 25, 2024
2982e42
Merge branch 'master' into master
famosab Jun 25, 2024
7bf628f
Update modules/nf-core/dysgu/main.nf
poddarharsh15 Jul 3, 2024
a24fd75
Update modules/nf-core/dysgu/environment.yml
poddarharsh15 Jul 3, 2024
a7941d5
env.yml pip update
poddarharsh15 Jul 3, 2024
615892a
dysgu_image_update
poddarharsh15 Jul 3, 2024
7b3bbca
Merge branch 'master' into master
poddarharsh15 Jul 3, 2024
36617f6
small changes
famosab Jul 4, 2024
037a0bb
meta.yml
poddarharsh15 Jul 4, 2024
8fa36e2
Update modules/nf-core/dysgu/main.nf
poddarharsh15 Jul 5, 2024
235f241
Update modules/nf-core/dysgu/environment.yml
poddarharsh15 Jul 5, 2024
1e6f982
Update modules/nf-core/dysgu/meta.yml
poddarharsh15 Jul 5, 2024
c140b53
Merge branch 'master' into master
poddarharsh15 Jul 5, 2024
e9effd3
updated_sanp_file
poddarharsh15 Jul 5, 2024
0286369
Merge branch 'master' into master
famosab Jul 5, 2024
338856c
Update modules/nf-core/dysgu/tests/main.nf.test
poddarharsh15 Jul 5, 2024
793f370
Update modules/nf-core/dysgu/tests/main.nf.test
poddarharsh15 Jul 5, 2024
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
24 changes: 0 additions & 24 deletions .devcontainer/devcontainer.json

This file was deleted.

7 changes: 7 additions & 0 deletions modules/nf-core/dysgu/environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: dysgu
channels:
- conda-forge
- bioconda
- defaults
dependencies:
- dysgu
55 changes: 55 additions & 0 deletions modules/nf-core/dysgu/main.nf
famosab marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
process DYSGU {
tag "$meta.id"
label 'process_medium'

conda "${moduleDir}/environment.yml"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'oras://community.wave.seqera.io/library/dysgu:48830f55112c399e':
'community.wave.seqera.io/library/dysgu:faf71ac972284412' }"

input:
tuple val(meta), path(input_bam), path(input_bam_index)
Copy link
Contributor

Choose a reason for hiding this comment

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

The tool takes cram files too, given your test, so maybe call this something more generic? Can't recall off the top of my head what we typically use to mean bam/cram.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

checked main.nf of manta instead of input_bam here it's described just input
will this work?

input:
  
   tuple val(meta), path(input), path(index), path(target_bed), path(target_bed_tbi)
   tuple val(meta2), path(fasta)
   tuple val(meta3), path(fai)
   path(config)

Copy link
Contributor

Choose a reason for hiding this comment

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

input and index sounds fine.

Copy link
Contributor

Choose a reason for hiding this comment

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

change it and update in the meta accordingly

tuple val(meta2), path(fasta), path(fai)

output:
tuple val(meta), path('*.vcf.gz') , emit: vcf
tuple val(meta), path('*.vcf.gz.tbi') , emit: tbi
path 'versions.yml' , emit: versions

when:
task.ext.when == null || task.ext.when

script:
def args = task.ext.args ?: ''
poddarharsh15 marked this conversation as resolved.
Show resolved Hide resolved
def args2 = task.ext.args2 ?: ''
def args3 = task.ext.args3 ?: ''
def prefix = task.ext.prefix ?: "${meta.id}"
"""
dysgu run \\
-p ${task.cpus} \\
-x \\
$fasta \\
. \\
$input_bam \\
| bgzip ${args2} --threads ${task.cpus} --stdout > ${prefix}.vcf.gz
tabix ${args3} ${prefix}.vcf.gz

poddarharsh15 marked this conversation as resolved.
Show resolved Hide resolved
cat <<-END_VERSIONS > versions.yml
"${task.process}":
dysgu: \$(dysgu --version 2>&1)
END_VERSIONS
"""

stub:
def args = task.ext.args ?: ''
def prefix = task.ext.prefix ?: "${meta.id}"
"""
echo "" | gzip > ${prefix}.vcf.gz
poddarharsh15 marked this conversation as resolved.
Show resolved Hide resolved
touch ${prefix}.vcf.gz.tbi

cat <<-END_VERSIONS > versions.yml
"${task.process}":
dysgu: \$(dysgu --version 2>&1)
END_VERSIONS
"""
}
72 changes: 72 additions & 0 deletions modules/nf-core/dysgu/meta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: dysgu

description: Dysgu calls structural variants (SVs) from mapped sequencing reads. It is designed for accurate and efficient detection of structural variations.
keywords:
- structural variants
- sv
- vcf
tools:
- dysgu:
description: Structural variant caller for mapped sequencing data
homepage: https://github.com/kcleal/dysgu
documentation: https://github.com/kcleal/dysgu/blob/master/README.rst
tool_dev_url: https://github.com/kcleal/dysgu
doi: "10.1093/nar/gkac039"
licence: ["GPL-3.0-or-later"]

input:
# Only when we have meta
- meta:
type: map
description: |
Groovy Map containing sample information
e.g. `[ id:'sample1' ]`

- input_bam:
type: file
description: Input BAM file
pattern: "*.bam"
- input_bam_index:
type: file
description: BAM index file
pattern: "*.bai"
- fasta:
type: file
description: Genome reference FASTA file
pattern: "*.{fa,fasta}"
- meta2:
type: map
description: |
Groovy Map containing reference information
e.g. [ id:'genome' ]
- fai:
type: file
description: Genome reference FASTA index file
pattern: "*.{fa.fai,fasta.fai}"

output:
#Only when we have meta
- meta:
type: map
description: |
Groovy Map containing sample information
e.g. [ id:'sample1' ]
- vcf:
type: file
description: VCF file with identified structural variants
pattern: "*.{vcf.gz}"
- tbi:
type: file
description: The index of the BCF/VCF file
pattern: "*.{vcf.gz.tbi}"
- versions:
type: file
description: File containing software versions
pattern: "versions.yml"

authors:
- "@kcleal"
- "@famosab"
- "@poddarharsh15"
maintainers:
- "@kcleal"
96 changes: 96 additions & 0 deletions modules/nf-core/dysgu/tests/main.nf.test
famosab marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
nextflow_process {

name "Test Process DYSGU"
script "../main.nf"
process "DYSGU"
config "./nextflow.config"
tag "modules"
tag "modules_nfcore"
tag "dysgu"


test("human - bam") {

when {
process {
"""
input[0] = [ [ id:'test'], // meta map
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test.paired_end.recalibrated.sorted.bam', checkIfExists: true),
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test.paired_end.recalibrated.sorted.bam.bai', checkIfExists: true)
]
input[1] = [ [ id:'reference'], // meta map
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta', checkIfExists: true),
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta.fai', checkIfExists: true)
]
"""
}
}

then {
assertAll(
{ assert process.success },
{ assert snapshot(process.out.versions).match() },
{ assert path(process.out.vcf.get(0).get(1)).linesGzip.contains("##fileformat=VCFv4.2") }
)
}

}


test("human - cram") {

when {
process {
"""
input[0] = [ [ id:'test'], // meta map
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/cram/test.paired_end.recalibrated.sorted.cram', checkIfExists: true),
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/cram/test.paired_end.recalibrated.sorted.cram.crai', checkIfExists: true)
]
input[1] = [ [ id:'reference'], // meta map
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta', checkIfExists: true),
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta.fai', checkIfExists: true)
]
"""
}
}

then {
assertAll(
{ assert process.success },
{ assert snapshot(process.out.versions).match() },
{ assert path(process.out.vcf.get(0).get(1)).linesGzip.contains("##fileformat=VCFv4.2") }
)
}

}


test("human - bam - stub") {

options "-stub"

when {
process {
"""
input[0] = [ [ id:'test'], // meta map
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test.paired_end.recalibrated.sorted.bam', checkIfExists: true),
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/illumina/bam/test.paired_end.recalibrated.sorted.bam.bai', checkIfExists: true)
]
input[1] = [ [ id:'reference'], // meta map
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta', checkIfExists: true),
file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/chr21/sequence/genome.fasta.fai', checkIfExists: true)
]
"""
}
}

then {
assertAll(
{ assert process.success },
{ assert snapshot(process.out).match() }
)
}

}

}
75 changes: 75 additions & 0 deletions modules/nf-core/dysgu/tests/main.nf.test.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"human - bam - stub": {
"content": [
{
"0": [
[
{
"id": "test"
},
"test.vcf.gz:md5,68b329da9893e34099c7d8ad5cb9c940"
]
],
"1": [
[
{
"id": "test"
},
"test.vcf.gz.tbi:md5,d41d8cd98f00b204e9800998ecf8427e"
]
],
"2": [
"versions.yml:md5,cf1e0487502108690603dd16f034bf5e"
],
"tbi": [
[
{
"id": "test"
},
"test.vcf.gz.tbi:md5,d41d8cd98f00b204e9800998ecf8427e"
]
],
"vcf": [
[
{
"id": "test"
},
"test.vcf.gz:md5,68b329da9893e34099c7d8ad5cb9c940"
]
],
"versions": [
"versions.yml:md5,cf1e0487502108690603dd16f034bf5e"
]
}
],
"meta": {
"nf-test": "0.8.4",
"nextflow": "24.04.2"
},
"timestamp": "2024-07-05T12:45:09.914383"
},
"cram": {
"content": [
[
"versions.yml:md5,cf1e0487502108690603dd16f034bf5e"
]
],
"meta": {
"nf-test": "0.8.4",
"nextflow": "24.04.2"
},
"timestamp": "2024-07-05T12:45:03.699174"
},
"bam": {
"content": [
[
"versions.yml:md5,cf1e0487502108690603dd16f034bf5e"
]
],
"meta": {
"nf-test": "0.8.4",
"nextflow": "24.04.2"
},
"timestamp": "2024-07-05T12:44:55.46735"
}
}
5 changes: 5 additions & 0 deletions modules/nf-core/dysgu/tests/nextflow.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
process {
withName: DYSGU {
ext.args = '--exome '
}
}
2 changes: 2 additions & 0 deletions modules/nf-core/dysgu/tests/tags.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dysgu:
- "modules/nf-core/dysgu/**"
8 changes: 8 additions & 0 deletions modules/nf-core/manta/tumoronly/tests/main.nf.test.snap
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,14 @@
},
"timestamp": "2024-03-21T14:44:15.752887"
},
"bed_version": {
"content": null,
"meta": {
"nf-test": "0.8.4",
"nextflow": "24.04.2"
},
"timestamp": "2024-06-24T16:22:36.610649"
},
"version": {
"content": null,
"meta": {
Expand Down
Loading