Skip to content

Commit bef6481

Browse files
authored
Merge pull request #113 from sanger-tol/dev
Release 1.1.7
2 parents f74f918 + 3350343 commit bef6481

37 files changed

Lines changed: 1884 additions & 135 deletions

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,25 @@
33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

6+
## [[1.1.7](https://github.com/sanger-tol/variantcalling/releases/tag/1.1.7)] - Shang Tang (patch 7) - [2025-06-26]
7+
8+
### Enhancements & fixes
9+
10+
- Update Deepvariant to version 1.9.0 (conda-free)
11+
- Add module [DEEPVARIANT_VCFSTATSREPORT](https://github.com/nf-core/modules/tree/master/modules/nf-core/deepvariant/vcfstatsreport) to generate visual report from Deepvariant
12+
- Compress and index concatenated VCFs
13+
14+
### Software dependencies
15+
16+
Note, since the pipeline is using Nextflow DSL2, each process will be run with its own [Biocontainer](https://biocontainers.pro/#/registry). This means that on occasion it is entirely possible for the pipeline to be using different versions of the same tool. However, the overall software dependency changes compared to the last release have been listed below for reference. Only `Docker` or `Singularity` containers are supported, `conda` is not supported.
17+
18+
| Dependency | Old version | New version |
19+
| ----------- | ----------- | ----------- |
20+
| Deepvariant | 1.6.1 | 1.9.0 |
21+
| HTSlib | | 1.21 |
22+
23+
> **NB:** Dependency has been **updated** if both old and new version information is present. </br> **NB:** Dependency has been **added** if just the new version information is present. </br> **NB:** Dependency has been **removed** if version information isn't present.
24+
625
## [[1.1.6](https://github.com/sanger-tol/variantcalling/releases/tag/1.1.6)] - Shang Tang (patch 6) - [2025-02-10]
726

827
### Enhancements & fixes

CITATION.cff

Lines changed: 48 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,52 @@
1-
# This CITATION.cff file was generated with cffinit.
2-
# Visit https://bit.ly/cffinit to generate yours today!
3-
4-
cff-version: 1.2.0
5-
title: sanger-tol/variantcalling v1.1.0
6-
message: >-
7-
If you use this software, please cite it using the
8-
metadata from this file.
9-
type: software
101
authors:
11-
- given-names: Guoying
2+
- affiliation: Universidade Federal do Rio Grande do Norte
3+
family-names: Apolonio de Amorim
4+
given-names: Julia
5+
orcid: https://orcid.org/0000-0002-8539-527X
6+
website: https://github.com/juliaapolonio
7+
- affiliation: Wellcome Sanger Institute
8+
email: tc25@sanger.ac.uk
9+
family-names: Chafin
10+
given-names: Tyler
11+
orcid: https://orcid.org/0000-0001-8687-5905
12+
website: https://github.com/tkchafin
13+
- affiliation: Wellcome Sanger Institute
14+
family-names: "Ho\xE0ng"
15+
given-names: "H\u1EA1nh"
16+
orcid: https://orcid.org/0009-0008-6911-9903
17+
website: https://github.com/sainsachiko
18+
- affiliation: Wellcome Sanger Institute
19+
email: mm49@sanger.ac.uk
20+
family-names: Muffato
21+
given-names: Matthieu
22+
orcid: https://orcid.org/0000-0002-7860-3560
23+
website: https://github.com/muffato
24+
- affiliation: Wellcome Sanger Institute
25+
email: 729395+gq1@users.noreply.github.com
1226
family-names: Qi
13-
affiliation: Wellcome Sanger Institute
14-
orcid: "https://orcid.org/0000-0003-1262-8973"
15-
- given-names: Priyanka
27+
given-names: Guoying
28+
orcid: https://orcid.org/0000-0003-1262-8973
29+
website: https://github.com/gq1
30+
- affiliation: Wellcome Sanger Institute
31+
email: ps22@sanger.ac.uk
1632
family-names: Surana
17-
affiliation: Wellcome Sanger Institute
18-
orcid: "https://orcid.org/0000-0002-7167-0875"
19-
- given-names: Matthieu
20-
family-names: Muffato
21-
affiliation: Wellcome Sanger Institute
22-
orcid: "https://orcid.org/0000-0002-7860-3560"
23-
- given-names: Tyler
24-
family-names: Chafin
25-
affiliation: Wellcome Sanger Institute
26-
orcid: "https://orcid.org/0000-0001-8687-5905"
27-
identifiers:
28-
- type: doi
29-
value: 10.5281/zenodo.7890528
30-
repository-code: "https://github.com/sanger-tol/variantcalling"
33+
given-names: Priyanka
34+
orcid: https://orcid.org/0000-0002-7167-0875
35+
website: https://github.com/priyanka-surana
36+
- affiliation: Wellcome Sanger Institute
37+
email: naranbjg@gmail.com
38+
family-names: Zhang
39+
given-names: Yunjia
40+
orcid: https://orcid.org/0000-0001-7029-0785
41+
website: https://github.com/yz533cb
42+
cff-version: 1.2.0
43+
date-released: "2025-06-25"
44+
doi: 10.5281/zenodo.7890527
3145
license: MIT
32-
commit: TODO
33-
version: 1.1.0
34-
date-released: "2022-12-20"
46+
message: If you use this software, please cite it using the metadata from this file
47+
and all references from CITATIONS.md .
48+
repository-code: https://github.com/sanger-tol/variantcalling
49+
title: sanger-tol/variantcalling v1.1.7 - Shang Tang (patch 7)
50+
type: software
51+
url: https://pipelines.tol.sanger.ac.uk/variantcalling
52+
version: 1.1.7

assets/samplesheet_test_full.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
sample,datatype,datafile
2-
icCanRufa1,pacbio,/lustre/scratch123/tol/resources/nextflow/test-data/Cantharis_rufa/analysis/icCanRufa1/read_mapping/pacbio/GCA_947369205.1.unmasked.pacbio.icCanRufa1.cram
2+
icCanRufa1,pacbio,/nfs/treeoflife-01/resources/nextflow/test-data/Cantharis_rufa/analysis/icCanRufa1/read_mapping/pacbio/GCA_947369205.1.unmasked.pacbio.icCanRufa1.cram
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
sample,datatype,datafile
2-
ilPolIcar1,pacbio,/lustre/scratch124/tol/projects/darwin/data/insects/Polyommatus_icarus/genomic_data/ilPolIcar1/pacbio/m64016_191206_183623.ccs.bc1019_BAK8B_OA--bc1019_BAK8B_OA.bam
2+
ilPolIcar1,pacbio,/lustre/scratch122/tol/data/c/2/0/7/e/5/Polyommatus_icarus/genomic_data/ilPolIcar1/pacbio/m64016_191206_183623.ccs.bc1019_BAK8B_OA--bc1019_BAK8B_OA.bam

conf/modules.config

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,22 +93,56 @@ process {
9393

9494
withName: '.*:DEEPVARIANT_CALLER:BCFTOOLS_CONCAT_VCF' {
9595
ext.prefix = { "${meta.id}_deepvariant" }
96+
}
97+
98+
withName: '.*:DEEPVARIANT_CALLER:BCFTOOLS_CONCAT_GVCF' {
99+
ext.prefix = { "${meta.id}_deepvariant.g" }
100+
}
101+
102+
withName: 'BGZIP' {
103+
ext.prefix = { "${input.baseName}" }
96104
publishDir = [
97105
path: { "${params.outdir}/variant_calling" },
98106
mode: params.publish_dir_mode,
99107
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
100108
]
101109
}
102110

103-
withName: '.*:DEEPVARIANT_CALLER:BCFTOOLS_CONCAT_GVCF' {
104-
ext.prefix = { "${meta.id}_deepvariant.g" }
111+
withName: 'TABIX_CSI' {
112+
ext.args = "--preset vcf --csi"
113+
publishDir = [
114+
path: { "${params.outdir}/variant_calling" },
115+
mode: params.publish_dir_mode,
116+
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
117+
]
118+
}
119+
withName: 'TABIX_TBI' {
120+
ext.args = "--preset vcf"
105121
publishDir = [
106122
path: { "${params.outdir}/variant_calling" },
107123
mode: params.publish_dir_mode,
108124
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
109125
]
110126
}
111127

128+
withName: 'VCF_STATS_REPORT' {
129+
ext.prefix = { "${meta.id}_vcf.stats" }
130+
publishDir = [
131+
path: { "${params.outdir}/variant_calling/report" },
132+
mode: params.publish_dir_mode,
133+
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
134+
]
135+
}
136+
137+
withName: 'GVCF_STATS_REPORT' {
138+
ext.prefix = { "${meta.id}_gvcf.stats" }
139+
publishDir = [
140+
path: { "${params.outdir}/variant_calling/report" },
141+
mode: params.publish_dir_mode,
142+
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
143+
]
144+
}
145+
112146
withName: '.*:PROCESS_VCF:VCFTOOLS_SITE_PI' {
113147
ext.args = '--site-pi'
114148
if( params.include_positions ){

conf/test_full.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ params {
1818
input = "${projectDir}/assets/samplesheet_test_full.csv"
1919

2020
// Fasta references
21-
fasta = '/lustre/scratch124/tol/projects/darwin/data/insects/Cantharis_rufa/assembly/release/icCanRufa1.1/insdc/GCA_947369205.1.fasta.gz'
21+
fasta = '/lustre/scratch122/tol/data/1/f/4/a/0/9/Cantharis_rufa/assembly/release/icCanRufa1.1/insdc/GCA_947369205.1.fasta.gz'
2222

2323
// Reference index file
24-
fai = '/lustre/scratch124/tol/projects/darwin/data/insects/Cantharis_rufa/assembly/release/icCanRufa1.1/insdc/GCA_947369205.1.fasta.gz.gzi'
24+
fai = '/lustre/scratch122/tol/data/1/f/4/a/0/9/Cantharis_rufa/assembly/release/icCanRufa1.1/insdc/GCA_947369205.1.fasta.gz.gzi'
2525
}

conf/test_full_align.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ params {
1919
align = true
2020

2121
// Fasta references
22-
fasta = "/lustre/scratch124/tol/projects/darwin/data/insects/Polyommatus_icarus/assembly/release/ilPolIcar1.1/insdc/GCA_937595015.1.fasta.gz"
22+
fasta = "/lustre/scratch122/tol/data/c/2/0/7/e/5/Polyommatus_icarus/assembly/release/ilPolIcar1.1/insdc/GCA_937595015.1.fasta.gz"
2323

2424
}

docs/output.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ The aligned PacBio read data is used to call variants with DeepVariant. This is
6262

6363
- `variant_calling`
6464
- Compressed VCF files: `<fasta_name>.pacbio.<sample_name>_deepvariant.vcf.gz`.
65+
- Index of compressed VCF files: `<fasta_name>.pacbio.<sample_name>_deepvariant.vcf.gz.[tbi|csi]`.
6566
- Compressed GVCF files: `<fasta_name>.pacbio.<sample_name>_deepvariant.g.vcf.gz`.
67+
- Index of compressed GVCF files: `<fasta_name>.pacbio.<sample_name>_deepvariant.g.vcf.gz.[tbi|csi]`.
68+
- `reports`
69+
- HTML files: `<fasta_name>.pacbio.<sample_name>_[vcf|gvcf].stats.visual_report.html`.
6670

6771
</details>
6872

modules.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,15 @@
3333
},
3434
"deepvariant/rundeepvariant": {
3535
"branch": "master",
36-
"git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",
36+
"git_sha": "123fdbae2bf2c827b2e11ae09c4d481f446b8ffb",
3737
"installed_by": ["modules"],
3838
"patch": "modules/nf-core/deepvariant/rundeepvariant/deepvariant-rundeepvariant.diff"
3939
},
40+
"deepvariant/vcfstatsreport": {
41+
"branch": "master",
42+
"git_sha": "123fdbae2bf2c827b2e11ae09c4d481f446b8ffb",
43+
"installed_by": ["modules"]
44+
},
4045
"gunzip": {
4146
"branch": "master",
4247
"git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",
@@ -98,6 +103,16 @@
98103
"installed_by": ["modules"],
99104
"patch": "modules/nf-core/samtools/view/samtools-view.diff"
100105
},
106+
"tabix/bgzip": {
107+
"branch": "master",
108+
"git_sha": "52a49a8807214ba93b0fdc9fa401876d9845f62a",
109+
"installed_by": ["modules"]
110+
},
111+
"tabix/tabix": {
112+
"branch": "master",
113+
"git_sha": "05954dab2ff481bcb999f24455da29a5828af08d",
114+
"installed_by": ["modules"]
115+
},
101116
"untar": {
102117
"branch": "master",
103118
"git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",

modules/nf-core/deepvariant/rundeepvariant/deepvariant-rundeepvariant.diff

Lines changed: 50 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)