Skip to content

Commit 31c2fec

Browse files
authored
Merge pull request #2043 from Clinical-Genomics/release/12.0.0
Release/12.0.0
2 parents 313d35a + 2b958ac commit 31c2fec

28 files changed

+187
-160
lines changed

CHANGELOG.md

+37-3
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,55 @@
33
All notable changes to this project will be documented in this file.
44
This project adheres to [Semantic Versioning](http://semver.org/).
55

6+
## [12.0.0]
7+
8+
- Set overlap requirement for merging two SVs to 0.8, down from the 0.95 default
9+
- Set overlap requirement for SV annotation to 0.6, up from 0.5
10+
- Update Tiddit to improve SV positioning
11+
- Increased memory allocation for salmon and picardtools_mergersamfiles (RNA)
12+
- New version of MegaFusion. A bug in the previous version prevented SVDB from writing the format and sample field in the vcf.
13+
- Remove the RSeQC read duplication analysis as it often fails.
14+
- Increased run time allocation for gatk_asereadcounter.
15+
- Increased the default required length for a trimmed rna read to be retained from 20 bp to 40 bp. Configurable via CLI or config.
16+
- Fixed a bug where gnomad SV version 2.0 instead of version 2.1 was used to annotate SVs
17+
- One-pass instead of two-pass mapping with STAR-Fusion, as recommended for STAR-Fusion 1.12
18+
- Bump max run time for retroseq to 15 hours.
19+
20+
### Tools
21+
22+
- Arriba 2.3.0 -> 2.4.0
23+
- DeepVariant 1.4.0 -> 1.5.0
24+
- FastQC: 0.11.9 -> 0.12.1
25+
- GATK: 4.2.6.1 -> 4.4.0.0
26+
- Gffcompare 0.11.2 -> 0.12.6
27+
- Htslib 1.15.1 -> 1.16
28+
- MegaFusion 66a3a80 -> d3feacf
29+
- Picard 2.27.2 -> 2.27.5
30+
- STAR-Fusion 1.11.0 -> 1.12.0
31+
- SVDB: 2.7.0 -> 2.8.2
32+
- Tiddit 3.3.2 -> 3.6.0
33+
34+
### Databases
35+
36+
clinvar: 20220829 -> 20230508
37+
loqusdb snapshot: 20230208 -> 20230512
38+
hmtvar: oct2022
39+
640
## [11.2.2]
741

842
- New patch of gens pre processing container.
943

1044
### Tools
1145

12-
gens_preproc 1.0.8 -> 1.0.11
46+
- gens_preproc 1.0.8 -> 1.0.11
1347

1448
## [11.2.1]
1549

1650
- Patching of gens pre processing container to solve an issue with incomplete bed files.
1751

1852
### Tools
1953

20-
gens_preproc 1.0.2 -> 1.0.8
54+
- gens_preproc 1.0.2 -> 1.0.8
2155

2256
## [11.2.0]
2357

@@ -88,7 +122,7 @@ gens_preproc 1.0.2 -> 1.0.8
88122
- dbnsfp: 4.1a -> 4.3a (grch38 only)
89123
- gnomad: r3.1.1 -> r3.1.2 (grch38 only)
90124
- giab: 3.3.2 -> 4.2.1
91-
- loqusdb dump: 20210921 -> 20220905
125+
- loqusdb dump: 20210921 -> c
92126
- nist: v3.3.2 -> v4.2.1
93127
- vcf2cytosure blacklist: 200520
94128

containers/fastqc/Dockerfile

+4-6
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ FROM clinicalgenomics/mip_base:2.1
55
################## METADATA ######################
66

77
LABEL base_image="clinicalgenomics/mip_base:2.1"
8-
LABEL version="2"
8+
LABEL version="3"
99
LABEL software="fastqc"
10-
LABEL software.version="0.11.9"
10+
LABEL software.version="0.12.1"
1111
LABEL extra.binaries="fastqc"
1212
LABEL maintainer="Clinical-Genomics/MIP"
1313

14-
RUN conda install fastqc=0.11.9=0
15-
16-
## Clean up after conda
17-
RUN /opt/conda/bin/conda clean -tipsy
14+
RUN conda install fastqc=0.12.1 && \
15+
/opt/conda/bin/conda clean -ya
1816

1917
WORKDIR /data/

containers/gffcompare/Dockerfile

-19
This file was deleted.

containers/hmtnote/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ FROM clinicalgenomics/mip_base:2.1
55
################## METADATA ######################
66

77
LABEL base-image="clinicalgenomics/mip_base:2.1"
8-
LABEL version="1"
8+
LABEL version="2"
99
LABEL software="HmtNote"
1010
LABEL software.version="0.7.2"
11-
LABEL extra.binaries="HmtNote"
11+
LABEL extra.binaries="HmtNote, hmtvar_oct2022"
1212
LABEL maintainer="Clinical-Genomics/MIP"
1313

1414
## Conda env installation + clean up
1515
RUN conda install pip python=3.7 && \
16-
/opt/conda/bin/conda clean -tipsy
16+
/opt/conda/bin/conda clean -ya
1717

1818
# Install HmtNote
1919
RUN pip install --no-cache-dir hmtnote==0.7.2 && \

containers/htslib/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ FROM clinicalgenomics/mip_base:2.1
55
################## METADATA ######################
66

77
LABEL base-image="clinicalgenomics/mip_base:2.1"
8-
LABEL version="7"
8+
LABEL version="8"
99
LABEL software="htslib"
10-
LABEL software.version="1.15.1"
10+
LABEL software.version="1.16"
1111
LABEL extra.binaries="bcftools, bgzip, samtools, tabix"
1212
LABEL maintainer="Clinical-Genomics/MIP"
1313

14-
RUN conda install bcftools=1.15.1 htslib=1.15.1 samtools=1.15.1 && \
14+
RUN conda install bcftools=1.16 htslib=1.16 samtools=1.16.1 && \
1515
/opt/conda/bin/conda clean -ya
1616

1717
WORKDIR /data/

containers/megafusion/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM clinicalgenomics/mip_base:2.1
77
LABEL base_image="clinicalgenomics/mip_base:2.1"
88
LABEL version="4"
99
LABEL software="MegaFusion"
10-
LABEL software.version="66a3a80"
10+
LABEL software.version="d3feacf"
1111
LABEL extra.binaries="MegaFusion.py"
1212
LABEL maintainer="Clinical-Genomics/MIP"
1313

@@ -25,5 +25,5 @@ RUN git clone https://github.com/J35P312/MegaFusion.git /opt/conda/share/MegaFus
2525
WORKDIR /opt/conda/share/MegaFusion
2626

2727
## Make sure we're on the right commit
28-
RUN git reset --hard 66a3a80
28+
RUN git reset --hard d3feacf
2929

definitions/rd_dna_parameters.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ recipe_time:
377377
prepareforvariantannotationblock: 5
378378
qccollect_ar: 1
379379
rankvariant: 10
380-
retroseq: 5
380+
retroseq: 15
381381
rhocall_ar: 5
382382
rhocall_viz: 1
383383
rtg_vcfeval: 1
@@ -959,6 +959,12 @@ sv_svdb_merge_prioritize:
959959
data_type: SCALAR
960960
default: tiddit,cnvnator,manta
961961
type: recipe_argument
962+
sv_svdb_merge_overlap:
963+
associated_recipe:
964+
- sv_combinevariantcallsets
965+
data_type: SCALAR
966+
default: 0.8
967+
type: recipe_argument
962968
sv_decompose:
963969
associated_recipe:
964970
- sv_combinevariantcallsets
@@ -1015,7 +1021,7 @@ sv_svdb_query_overlap:
10151021
associated_recipe:
10161022
- sv_annotate
10171023
data_type: SCALAR
1018-
default: 0.5
1024+
default: 0.6
10191025
type: recipe_argument
10201026
sv_vcfanno_config:
10211027
associated_recipe:

definitions/rd_rna_parameters.yaml

+10-3
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ recipe_time:
146146
dna_vcf_reformat: 1
147147
fastqc_ar: 1
148148
fusion_report: 8
149-
gatk_asereadcounter: 3
149+
gatk_asereadcounter: 8
150150
gatk_baserecalibration: 5
151151
gatk_haplotypecaller: 12
152152
gatk_splitncigarreads: 16
@@ -191,10 +191,10 @@ recipe_memory:
191191
merge_fusion_reports: 8
192192
multiqc_ar: 10
193193
picardtools_collectrnaseqmetrics: 10
194-
picardtools_mergesamfiles: 5
194+
picardtools_mergesamfiles: 8
195195
preseq_ar: 8
196196
rseqc: 40
197-
salmon_quant: 2
197+
salmon_quant: 4
198198
star_aln: 5
199199
star_fusion: 25
200200
stringtie_ar: 2
@@ -301,6 +301,13 @@ trim_galore_ar:
301301
program_executables:
302302
- trim_galore
303303
type: recipe
304+
trim_min_length:
305+
associated_recipe:
306+
- trim_galore_ar
307+
data_type: SCALAR
308+
default: 40
309+
mandatory: no
310+
type: recipe_argument
304311
## Salmon
305312
salmon_quant:
306313
analysis_mode: sample

documentation/Setup.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ You can speed up, for instance, the Readonly module by also installing the compa
7676
- [STAR] (version: 2.7.8a)
7777
- [Stranger] (version: 0.8.0)
7878
- [StringTie] (version: 2.1.3b)
79-
- [Svdb] (version: 2.4.0)
79+
- [Svdb] (version: 2.8.2)
8080
- [Telomerecat] (version: 3.4.0)
81-
- [Tiddit] (version: 2.12.1)
81+
- [Tiddit] (version: 3.6.0)
8282
- [Upd] (version: 0.1.1)
8383
- [Varg] (version: 1.2.0)
8484
- [Vcf2cytosure] (version: 0.5.1)

lib/MIP/Cli/Mip/Analyse/Rd_dna.pm

+9-1
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,14 @@ q{Default: grch37_dbsnp_-138-.vcf, grch37_1000g_indels_-phase1-.vcf, grch37_mill
827827
)
828828
);
829829

830+
option(
831+
q{sv_svdb_merge_overlap} => (
832+
documentation => q{Required overlap to merge two structural variants},
833+
is => q{rw},
834+
isa => Num,
835+
)
836+
);
837+
830838
option(
831839
q{sv_svdb_merge_prioritize} => (
832840
documentation => q{Prioritization order of structural variant callers},
@@ -897,7 +905,7 @@ q{Default: grch37_dbsnp_-138-.vcf, grch37_1000g_indels_-phase1-.vcf, grch37_mill
897905
q{sv_svdb_query_overlap} => (
898906
documentation => q{Database file(s) for annotation},
899907
is => q{rw},
900-
isa => Str,
908+
isa => Num,
901909
)
902910
);
903911

lib/MIP/Cli/Mip/Analyse/Rd_rna.pm

+8
Original file line numberDiff line numberDiff line change
@@ -976,6 +976,14 @@ q{Regular expression file containing the regular expression to be used for each
976976
)
977977
);
978978

979+
option(
980+
q{trim_min_length} => (
981+
documentation => q{Discard trimmed reads shorter than this},
982+
is => q{rw},
983+
isa => Int,
984+
)
985+
);
986+
979987
option(
980988
q{vcfparser_ar} => (
981989
cmd_tags => [q{Analysis recipe switch}],

lib/MIP/Constants.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Readonly our %ANALYSIS => (
8282
);
8383

8484
## Set MIP version
85-
Readonly our $MIP_VERSION => q{11.2.2};
85+
Readonly our $MIP_VERSION => q{12.0.0};
8686

8787
## Cli
8888
Readonly our $MOOSEX_APP_SCEEN_WIDTH => 160;

lib/MIP/Program/Trim_galore.pm

+11
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ sub trim_galore {
3737
## : $filehandle => Filehandle to write to
3838
## : $gzip_output => Gzip output fastq file
3939
## : $infile_paths_ref => Infile paths {REF}
40+
## : $length => Minimum length of trimmed read to retain
4041
## : $outdir_path => Outdirectory path
4142
## : $paired_reads => Do paired end trimming
4243
## : $stderrfile_path => Stderrfile path
@@ -50,6 +51,7 @@ sub trim_galore {
5051
my $cores;
5152
my $filehandle;
5253
my $infile_paths_ref;
54+
my $length;
5355
my $outdir_path;
5456
my $paired_reads;
5557
my $stderrfile_path;
@@ -88,6 +90,11 @@ sub trim_galore {
8890
store => \$infile_paths_ref,
8991
strict_type => 1,
9092
},
93+
length => {
94+
allow => [ undef, qr/\A \d+ \z/xms ],
95+
store => \$length,
96+
strict_type => 1,
97+
},
9198
outdir_path => {
9299
store => \$outdir_path,
93100
strict_type => 1,
@@ -137,6 +144,10 @@ sub trim_galore {
137144
push @commands, q{--paired};
138145
}
139146

147+
if ($length) {
148+
push @commands, q{--length} . $SPACE . $length;
149+
}
150+
140151
push @commands, join $SPACE, @{$infile_paths_ref};
141152

142153
push @commands,

lib/MIP/Recipes/Analysis/Rseqc.pm

-10
Original file line numberDiff line numberDiff line change
@@ -292,16 +292,6 @@ sub analysis_rseqc {
292292
);
293293
say {$filehandle} $NEWLINE;
294294

295-
say {$filehandle} q{## Rseqc read_duplication};
296-
rseqc_read_duplication(
297-
{
298-
filehandle => $filehandle,
299-
infile_path => $infile_path,
300-
outfiles_path_prefix => $outfile_path_prefix . $UNDERSCORE . q{read_duplication},
301-
}
302-
);
303-
say {$filehandle} $NEWLINE;
304-
305295
close $filehandle;
306296

307297
if ( $recipe{mode} == 1 ) {

lib/MIP/Recipes/Analysis/Star_aln.pm

+2-16
Original file line numberDiff line numberDiff line change
@@ -1037,8 +1037,9 @@ sub analysis_star_fusion_aln {
10371037
outfile_name_prefix => $outfile_path_prefix . $DOT,
10381038
pe_overlap_mmp => $PE_OVERLAP_MMP,
10391039
pe_overlap_nbases_min => $PE_OVERLAP_NBASES_MIN,
1040+
quant_mode => q{GeneCounts},
10401041
thread_number => $recipe{core_number},
1041-
two_pass_mode => q{Basic},
1042+
two_pass_mode => q{None},
10421043
},
10431044
);
10441045
say {$filehandle} $NEWLINE;
@@ -1053,21 +1054,6 @@ sub analysis_star_fusion_aln {
10531054
);
10541055
say {$filehandle} $NEWLINE;
10551056

1056-
## Remove intermediary files
1057-
FILE_TAG:
1058-
foreach my $file_tag (qw{ _STARgenome _STARpass1 }) {
1059-
1060-
gnu_rm(
1061-
{
1062-
filehandle => $filehandle,
1063-
force => 1,
1064-
infile_path => $outfile_path_prefix . $DOT . $file_tag,
1065-
recursive => 1,
1066-
}
1067-
);
1068-
print {$filehandle} $NEWLINE;
1069-
}
1070-
10711057
## Close filehandle
10721058
close $filehandle or $log->logcroak(q{Could not close filehandle});
10731059

0 commit comments

Comments
 (0)