Skip to content

Commit

Permalink
Merge pull request #2043 from Clinical-Genomics/release/12.0.0
Browse files Browse the repository at this point in the history
Release/12.0.0
  • Loading branch information
jemten authored Jun 29, 2023
2 parents 313d35a + 2b958ac commit 31c2fec
Show file tree
Hide file tree
Showing 28 changed files with 187 additions and 160 deletions.
40 changes: 37 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,55 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [12.0.0]

- Set overlap requirement for merging two SVs to 0.8, down from the 0.95 default
- Set overlap requirement for SV annotation to 0.6, up from 0.5
- Update Tiddit to improve SV positioning
- Increased memory allocation for salmon and picardtools_mergersamfiles (RNA)
- New version of MegaFusion. A bug in the previous version prevented SVDB from writing the format and sample field in the vcf.
- Remove the RSeQC read duplication analysis as it often fails.
- Increased run time allocation for gatk_asereadcounter.
- Increased the default required length for a trimmed rna read to be retained from 20 bp to 40 bp. Configurable via CLI or config.
- Fixed a bug where gnomad SV version 2.0 instead of version 2.1 was used to annotate SVs
- One-pass instead of two-pass mapping with STAR-Fusion, as recommended for STAR-Fusion 1.12
- Bump max run time for retroseq to 15 hours.

### Tools

- Arriba 2.3.0 -> 2.4.0
- DeepVariant 1.4.0 -> 1.5.0
- FastQC: 0.11.9 -> 0.12.1
- GATK: 4.2.6.1 -> 4.4.0.0
- Gffcompare 0.11.2 -> 0.12.6
- Htslib 1.15.1 -> 1.16
- MegaFusion 66a3a80 -> d3feacf
- Picard 2.27.2 -> 2.27.5
- STAR-Fusion 1.11.0 -> 1.12.0
- SVDB: 2.7.0 -> 2.8.2
- Tiddit 3.3.2 -> 3.6.0

### Databases

clinvar: 20220829 -> 20230508
loqusdb snapshot: 20230208 -> 20230512
hmtvar: oct2022

## [11.2.2]

- New patch of gens pre processing container.

### Tools

gens_preproc 1.0.8 -> 1.0.11
- gens_preproc 1.0.8 -> 1.0.11

## [11.2.1]

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

### Tools

gens_preproc 1.0.2 -> 1.0.8
- gens_preproc 1.0.2 -> 1.0.8

## [11.2.0]

Expand Down Expand Up @@ -88,7 +122,7 @@ gens_preproc 1.0.2 -> 1.0.8
- dbnsfp: 4.1a -> 4.3a (grch38 only)
- gnomad: r3.1.1 -> r3.1.2 (grch38 only)
- giab: 3.3.2 -> 4.2.1
- loqusdb dump: 20210921 -> 20220905
- loqusdb dump: 20210921 -> c
- nist: v3.3.2 -> v4.2.1
- vcf2cytosure blacklist: 200520

Expand Down
10 changes: 4 additions & 6 deletions containers/fastqc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ FROM clinicalgenomics/mip_base:2.1
################## METADATA ######################

LABEL base_image="clinicalgenomics/mip_base:2.1"
LABEL version="2"
LABEL version="3"
LABEL software="fastqc"
LABEL software.version="0.11.9"
LABEL software.version="0.12.1"
LABEL extra.binaries="fastqc"
LABEL maintainer="Clinical-Genomics/MIP"

RUN conda install fastqc=0.11.9=0

## Clean up after conda
RUN /opt/conda/bin/conda clean -tipsy
RUN conda install fastqc=0.12.1 && \
/opt/conda/bin/conda clean -ya

WORKDIR /data/
19 changes: 0 additions & 19 deletions containers/gffcompare/Dockerfile

This file was deleted.

6 changes: 3 additions & 3 deletions containers/hmtnote/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ FROM clinicalgenomics/mip_base:2.1
################## METADATA ######################

LABEL base-image="clinicalgenomics/mip_base:2.1"
LABEL version="1"
LABEL version="2"
LABEL software="HmtNote"
LABEL software.version="0.7.2"
LABEL extra.binaries="HmtNote"
LABEL extra.binaries="HmtNote, hmtvar_oct2022"
LABEL maintainer="Clinical-Genomics/MIP"

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

# Install HmtNote
RUN pip install --no-cache-dir hmtnote==0.7.2 && \
Expand Down
6 changes: 3 additions & 3 deletions containers/htslib/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ FROM clinicalgenomics/mip_base:2.1
################## METADATA ######################

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

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

WORKDIR /data/
4 changes: 2 additions & 2 deletions containers/megafusion/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FROM clinicalgenomics/mip_base:2.1
LABEL base_image="clinicalgenomics/mip_base:2.1"
LABEL version="4"
LABEL software="MegaFusion"
LABEL software.version="66a3a80"
LABEL software.version="d3feacf"
LABEL extra.binaries="MegaFusion.py"
LABEL maintainer="Clinical-Genomics/MIP"

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

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

10 changes: 8 additions & 2 deletions definitions/rd_dna_parameters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ recipe_time:
prepareforvariantannotationblock: 5
qccollect_ar: 1
rankvariant: 10
retroseq: 5
retroseq: 15
rhocall_ar: 5
rhocall_viz: 1
rtg_vcfeval: 1
Expand Down Expand Up @@ -959,6 +959,12 @@ sv_svdb_merge_prioritize:
data_type: SCALAR
default: tiddit,cnvnator,manta
type: recipe_argument
sv_svdb_merge_overlap:
associated_recipe:
- sv_combinevariantcallsets
data_type: SCALAR
default: 0.8
type: recipe_argument
sv_decompose:
associated_recipe:
- sv_combinevariantcallsets
Expand Down Expand Up @@ -1015,7 +1021,7 @@ sv_svdb_query_overlap:
associated_recipe:
- sv_annotate
data_type: SCALAR
default: 0.5
default: 0.6
type: recipe_argument
sv_vcfanno_config:
associated_recipe:
Expand Down
13 changes: 10 additions & 3 deletions definitions/rd_rna_parameters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ recipe_time:
dna_vcf_reformat: 1
fastqc_ar: 1
fusion_report: 8
gatk_asereadcounter: 3
gatk_asereadcounter: 8
gatk_baserecalibration: 5
gatk_haplotypecaller: 12
gatk_splitncigarreads: 16
Expand Down Expand Up @@ -191,10 +191,10 @@ recipe_memory:
merge_fusion_reports: 8
multiqc_ar: 10
picardtools_collectrnaseqmetrics: 10
picardtools_mergesamfiles: 5
picardtools_mergesamfiles: 8
preseq_ar: 8
rseqc: 40
salmon_quant: 2
salmon_quant: 4
star_aln: 5
star_fusion: 25
stringtie_ar: 2
Expand Down Expand Up @@ -301,6 +301,13 @@ trim_galore_ar:
program_executables:
- trim_galore
type: recipe
trim_min_length:
associated_recipe:
- trim_galore_ar
data_type: SCALAR
default: 40
mandatory: no
type: recipe_argument
## Salmon
salmon_quant:
analysis_mode: sample
Expand Down
4 changes: 2 additions & 2 deletions documentation/Setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ You can speed up, for instance, the Readonly module by also installing the compa
- [STAR] (version: 2.7.8a)
- [Stranger] (version: 0.8.0)
- [StringTie] (version: 2.1.3b)
- [Svdb] (version: 2.4.0)
- [Svdb] (version: 2.8.2)
- [Telomerecat] (version: 3.4.0)
- [Tiddit] (version: 2.12.1)
- [Tiddit] (version: 3.6.0)
- [Upd] (version: 0.1.1)
- [Varg] (version: 1.2.0)
- [Vcf2cytosure] (version: 0.5.1)
Expand Down
10 changes: 9 additions & 1 deletion lib/MIP/Cli/Mip/Analyse/Rd_dna.pm
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,14 @@ q{Default: grch37_dbsnp_-138-.vcf, grch37_1000g_indels_-phase1-.vcf, grch37_mill
)
);

option(
q{sv_svdb_merge_overlap} => (
documentation => q{Required overlap to merge two structural variants},
is => q{rw},
isa => Num,
)
);

option(
q{sv_svdb_merge_prioritize} => (
documentation => q{Prioritization order of structural variant callers},
Expand Down Expand Up @@ -897,7 +905,7 @@ q{Default: grch37_dbsnp_-138-.vcf, grch37_1000g_indels_-phase1-.vcf, grch37_mill
q{sv_svdb_query_overlap} => (
documentation => q{Database file(s) for annotation},
is => q{rw},
isa => Str,
isa => Num,
)
);

Expand Down
8 changes: 8 additions & 0 deletions lib/MIP/Cli/Mip/Analyse/Rd_rna.pm
Original file line number Diff line number Diff line change
Expand Up @@ -976,6 +976,14 @@ q{Regular expression file containing the regular expression to be used for each
)
);

option(
q{trim_min_length} => (
documentation => q{Discard trimmed reads shorter than this},
is => q{rw},
isa => Int,
)
);

option(
q{vcfparser_ar} => (
cmd_tags => [q{Analysis recipe switch}],
Expand Down
2 changes: 1 addition & 1 deletion lib/MIP/Constants.pm
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Readonly our %ANALYSIS => (
);

## Set MIP version
Readonly our $MIP_VERSION => q{11.2.2};
Readonly our $MIP_VERSION => q{12.0.0};

## Cli
Readonly our $MOOSEX_APP_SCEEN_WIDTH => 160;
Expand Down
11 changes: 11 additions & 0 deletions lib/MIP/Program/Trim_galore.pm
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ sub trim_galore {
## : $filehandle => Filehandle to write to
## : $gzip_output => Gzip output fastq file
## : $infile_paths_ref => Infile paths {REF}
## : $length => Minimum length of trimmed read to retain
## : $outdir_path => Outdirectory path
## : $paired_reads => Do paired end trimming
## : $stderrfile_path => Stderrfile path
Expand All @@ -50,6 +51,7 @@ sub trim_galore {
my $cores;
my $filehandle;
my $infile_paths_ref;
my $length;
my $outdir_path;
my $paired_reads;
my $stderrfile_path;
Expand Down Expand Up @@ -88,6 +90,11 @@ sub trim_galore {
store => \$infile_paths_ref,
strict_type => 1,
},
length => {
allow => [ undef, qr/\A \d+ \z/xms ],
store => \$length,
strict_type => 1,
},
outdir_path => {
store => \$outdir_path,
strict_type => 1,
Expand Down Expand Up @@ -137,6 +144,10 @@ sub trim_galore {
push @commands, q{--paired};
}

if ($length) {
push @commands, q{--length} . $SPACE . $length;
}

push @commands, join $SPACE, @{$infile_paths_ref};

push @commands,
Expand Down
10 changes: 0 additions & 10 deletions lib/MIP/Recipes/Analysis/Rseqc.pm
Original file line number Diff line number Diff line change
Expand Up @@ -292,16 +292,6 @@ sub analysis_rseqc {
);
say {$filehandle} $NEWLINE;

say {$filehandle} q{## Rseqc read_duplication};
rseqc_read_duplication(
{
filehandle => $filehandle,
infile_path => $infile_path,
outfiles_path_prefix => $outfile_path_prefix . $UNDERSCORE . q{read_duplication},
}
);
say {$filehandle} $NEWLINE;

close $filehandle;

if ( $recipe{mode} == 1 ) {
Expand Down
18 changes: 2 additions & 16 deletions lib/MIP/Recipes/Analysis/Star_aln.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1037,8 +1037,9 @@ sub analysis_star_fusion_aln {
outfile_name_prefix => $outfile_path_prefix . $DOT,
pe_overlap_mmp => $PE_OVERLAP_MMP,
pe_overlap_nbases_min => $PE_OVERLAP_NBASES_MIN,
quant_mode => q{GeneCounts},
thread_number => $recipe{core_number},
two_pass_mode => q{Basic},
two_pass_mode => q{None},
},
);
say {$filehandle} $NEWLINE;
Expand All @@ -1053,21 +1054,6 @@ sub analysis_star_fusion_aln {
);
say {$filehandle} $NEWLINE;

## Remove intermediary files
FILE_TAG:
foreach my $file_tag (qw{ _STARgenome _STARpass1 }) {

gnu_rm(
{
filehandle => $filehandle,
force => 1,
infile_path => $outfile_path_prefix . $DOT . $file_tag,
recursive => 1,
}
);
print {$filehandle} $NEWLINE;
}

## Close filehandle
close $filehandle or $log->logcroak(q{Could not close filehandle});

Expand Down
Loading

0 comments on commit 31c2fec

Please sign in to comment.