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

chore: develop to master #387

Merged
merged 55 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
c08bb4a
feat: new outputfile structure based on sample
jonca79 Nov 29, 2023
a66f501
feat: add amino acid change to coverage_and_mutations
jonca79 Dec 6, 2023
2dbc810
fix: bugfix
jonca79 Dec 6, 2023
b7eadaa
feat: updated hydra-genetics version
jonca79 Dec 8, 2023
6758fa4
fix: corrected input variables for hotspot_report.smk
jonca79 Dec 12, 2023
076f5fd
fix: corrected input variables for hotspot_report.py
jonca79 Dec 13, 2023
8ce6512
fix: corrected input file for hotspot_report.smk
jonca79 Dec 13, 2023
eef00aa
feat: update to latest common container
jonca79 Dec 13, 2023
635a40b
fix: remove unused time consuming step in fusioncatcher
jonca79 Dec 14, 2023
b820ab5
fix: remove newline after purity in cnvkit_call command
jonca79 Dec 19, 2023
be2682d
fix: update hydra-genetics to v1.10.1
jonca79 Dec 19, 2023
bfa94a6
fix: input file bugfix
jonca79 Dec 19, 2023
1449abd
fix: updated to bugfixed common container
jonca79 Dec 20, 2023
c6cd922
feat: decrease germline support needed to improve cnv visualization o…
jonca79 Dec 21, 2023
efb2827
feat: decrease support needed for germline SNVs
jonca79 Dec 21, 2023
373021c
feat: restructured rna fusion report for improved interpretation
jonca79 Dec 21, 2023
7fcd240
fix: bugfixes
jonca79 Dec 21, 2023
e9f2511
fix: bugfix
jonca79 Dec 27, 2023
794f8f7
fix: reverse sorting and add chr to fusioncatcher
jonca79 Dec 27, 2023
6bb5d42
fix: remove extra header columns
jonca79 Jan 10, 2024
7105a88
fix: housekeeping dict
jonca79 Jan 12, 2024
01046e6
feat: added dedup coverage
jonca79 Jan 12, 2024
0a4e6b5
test: pycodestyle
jonca79 Jan 12, 2024
969f6d7
test: fix breaking pulp version
jonca79 Jan 12, 2024
4634f47
test: Update requirements.txt
jonca79 Jan 12, 2024
355d99e
fix: changed sorting and bugfixes
jonca79 Jan 16, 2024
dd1cbe2
feat: added umi vcf filters
jonca79 Jan 17, 2024
f37c08a
fix: pulp version
jonca79 Jan 17, 2024
e5a5a66
Merge pull request #382 from genomic-medicine-sweden/speed_up_fusionc…
jonca79 Jan 19, 2024
2b8b156
Merge pull request #383 from genomic-medicine-sweden/rm_purity_newline
jonca79 Jan 19, 2024
671db52
Merge pull request #384 from genomic-medicine-sweden/CNV_BAF
jonca79 Jan 19, 2024
b778449
Merge branch 'develop' into umi_filter
jonca79 Jan 19, 2024
5877009
Merge pull request #386 from genomic-medicine-sweden/umi_filter
jonca79 Jan 19, 2024
e2513e0
Merge branch 'develop' into rna_report
jonca79 Jan 19, 2024
36f6377
Merge pull request #385 from genomic-medicine-sweden/rna_report
jonca79 Jan 19, 2024
2803f67
fix: delete extra file
jonca79 Jan 19, 2024
74e7deb
Merge pull request #377 from genomic-medicine-sweden/output_per_sample
jonca79 Jan 19, 2024
a8ed44c
fix: corrected results path for soft-filtered umi vcf
jonca79 Jan 19, 2024
2acb887
Merge pull request #381 from genomic-medicine-sweden/fix_coverage_and…
jonca79 Jan 19, 2024
30a6901
Merge pull request #388 from genomic-medicine-sweden/fix_umi_output
jonca79 Jan 19, 2024
39fefd8
fix: remove extra sample folder in output
jonca79 Jan 22, 2024
dec6f17
Merge pull request #390 from genomic-medicine-sweden/output_folder
jonca79 Jan 22, 2024
9346b03
feat: update reports module to 0.3.1 (#389)
maehler Jan 22, 2024
ed1a526
fix: added missing double mutations to report
jonca79 Jan 25, 2024
d282c9f
Merge pull request #392 from genomic-medicine-sweden/missing_double_m…
jonca79 Jan 25, 2024
5b30a35
feat: update Jenkins main test
jonca79 Jan 25, 2024
8cdaf1f
fix: update jenkins start scripts
jonca79 Jan 25, 2024
b3d56e2
fix: update profile with mounted home
jonca79 Jan 25, 2024
1947e3a
fix: update profile with mounted home
jonca79 Jan 25, 2024
0b1be40
fix: update profile with mounted home
jonca79 Jan 25, 2024
7665c8b
fix: update profile with mounted home
jonca79 Jan 25, 2024
887584b
fix: updated jenkins output for develop
jonca79 Jan 26, 2024
85abf47
fix: corrected filepath for rna in develop
jonca79 Jan 26, 2024
05eb8ef
fix: removed spaces in jenkins test develop
jonca79 Jan 26, 2024
b081274
Merge pull request #393 from genomic-medicine-sweden/update_jenkins
jonca79 Jan 26, 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
11 changes: 8 additions & 3 deletions config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ units: "units.tsv"
#hydra_local_path: "PATH_TO_REPO"

output: "config/output_files.yaml"
default_container: "docker://hydragenetics/common:1.8.1"
default_container: "docker://hydragenetics/common:1.10.2"

trimmer_software: "fastp_pe"

Expand Down Expand Up @@ -73,7 +73,7 @@ cnvkit_scatter:

cnv_html_report:
show_table: true
template_dir: config/reports/cnv_report_template
show_cytobands: true

cnv_tsv_report:
amp_cn_limit: 6.0
Expand Down Expand Up @@ -110,6 +110,7 @@ fgbio_group_reads_by_umi:

filter_vcf:
snv_soft_filter: "config/filters/config_soft_filter_uppsala_vep105.yaml"
snv_soft_filter_umi: "config/filters/config_soft_filter_umi_vep105.yaml"
snv_hard_filter: "config/filters/config_hard_filter_uppsala_vep105.yaml"
snv_hard_filter_umi: "config/filters/config_hard_filter_umi_vep105.yaml"
snv_hard_filter_purecn: "config/filters/config_hard_filter_purecn.yaml"
Expand All @@ -126,7 +127,7 @@ fuseq_wes:

fusioncatcher:
container: "docker://hydragenetics/fusioncatcher:1.33"
extra: "--visualization-sam"
extra: ""

gatk_calculate_contamination:
container: "docker://hydragenetics/gatk4:4.1.9.0"
Expand Down Expand Up @@ -361,6 +362,10 @@ vep:
mode: --offline --cache --refseq
extra: " --assembly GRCh37 --check_existing --pick --sift b --polyphen b --ccds --uniprot --hgvs --symbol --numbers --domains --regulatory --canonical --protein --biotype --uniprot --tsl --appris --gene_phenotype --af --af_1kg --af_gnomad --max_af --pubmed --variant_class "

vep_wo_pick:
mode: --offline --cache --refseq
extra: " --assembly GRCh37 --check_existing --sift b --polyphen b --ccds --uniprot --hgvs --symbol --numbers --domains --regulatory --canonical --protein --biotype --uniprot --tsl --appris --gene_phenotype --af --af_1kg --af_gnomad --max_af --pubmed --variant_class "

vt_decompose:
container: "docker://hydragenetics/vt:2015.11.10"

Expand Down
4 changes: 2 additions & 2 deletions config/filters/config_hard_filter_germline_vep105.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ filters:
expression: "(VEP:gnomAD_AF < 0.001)"
soft_filter: "False"
ad:
description: "Hard filter variants with few observations (AD lower than 50)"
expression: "(FORMAT:AD:1 < 50 or FORMAT:AD:0 < 50)"
description: "Hard filter variants with few observations (AD lower than 20)"
expression: "(FORMAT:AD:1 < 20 or FORMAT:AD:0 < 20)"
soft_filter: "False"
snp_type:
description: "Hard filter variants that are not SNVs"
Expand Down
4 changes: 2 additions & 2 deletions config/filters/config_hard_filter_germline_vep107.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ filters:
expression: "(VEP:gnomADe_AF < 0.001)"
soft_filter: "False"
ad:
description: "Hard filter variants with few observations (AD lower than 50)"
expression: "(FORMAT:AD:1 < 50 or FORMAT:AD:0 < 50)"
description: "Hard filter variants with few observations (AD lower than 20)"
expression: "(FORMAT:AD:1 < 20 or FORMAT:AD:0 < 20)"
soft_filter: "False"
snp_type:
description: "Hard filter variants that are not SNVs"
Expand Down
84 changes: 54 additions & 30 deletions config/filters/config_hard_filter_umi_vep105.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,69 @@ filters:
soft_filter: "False"
artifacts:
description: "Hard filter variants found in more than 3 normal samples"
expression: "((INFO:Artifact:0 > 3 and INFO:ArtifactNrSD:0 < 10) or (INFO:Artifact:1 > 3 and INFO:ArtifactNrSD:1 < 10))"
soft_filter: "False"
background:
description: "Hard filter position where background distribution overlaps variant (lower than 4 SD from median)"
expression: "(INFO:PositionNrSD < 0 and !exist[1-hotspot, INFO:Hotspot])"
expression: "((INFO:Artifact:0 > 2 and INFO:ArtifactNrSD:0 < 10) or (INFO:Artifact:0 > 2 and INFO:ArtifactNrSD:1 < 10))"
soft_filter: "False"
germline:
description: "Hard filter germline"
expression: "(VEP:gnomAD_AF > 0.005)"
soft_filter: "False"
af_ad_snv1:
description: "Hard filter SNV variants with low vaf and low ad"
expression: "(FORMAT:AF:0 < 0.003 and exist[SNV, VEP:VARIANT_CLASS])"
af_snv:
description: "Hard filter SNV variants with low vaf"
expression: "((FORMAT:AF:0 < 0.006 or FORMAT:AF:0 > 0.994) and exist[SNV, VEP:VARIANT_CLASS])"
soft_filter: "False"
ad_snv:
description: "Hard filter SNV variants with low ad"
expression: "((FORMAT:AD:1 < 15 or FORMAT:AD:0 < 15) and exist[SNV, VEP:VARIANT_CLASS])"
soft_filter: "False"
af_insertion:
description: "Hard filter Insertion variants with low vaf"
expression: "((FORMAT:AF:0 < 0.006 or FORMAT:AF:0 > 0.994) and exist[insertion, VEP:VARIANT_CLASS])"
soft_filter: "False"
ad_insertion:
description: "Hard filter Insertion variants with low ad"
expression: "((FORMAT:AD:1 < 15 or FORMAT:AD:0 < 15) and exist[insertion, VEP:VARIANT_CLASS])"
soft_filter: "False"
af_deletion:
description: "Hard filter Deletion variants with low vaf"
expression: "((FORMAT:AF:0 < 0.009 or FORMAT:AF:0 > 0.991) and exist[deletion, VEP:VARIANT_CLASS])"
soft_filter: "False"
ad_deletion:
description: "Hard filter Deletion variants with low ad"
expression: "((FORMAT:AD:1 < 20 or FORMAT:AD:0 < 20) and exist[deletion, VEP:VARIANT_CLASS])"
soft_filter: "False"
af_complex:
description: "Hard filter complex variants with low vaf"
expression: "((FORMAT:AF:0 < 0.009 or FORMAT:AF:0 > 0.991) and exist[indel, VEP:VARIANT_CLASS])"
soft_filter: "False"
ad_complex:
description: "Hard filter complex variants with low ad"
expression: "((FORMAT:AD:1 < 20 or FORMAT:AD:0 < 20) and exist[indel, VEP:VARIANT_CLASS])"
soft_filter: "False"
af_substitution:
description: "Hard filter substitution variants with low vaf"
expression: "((FORMAT:AF:0 < 0.006 or FORMAT:AF:0 > 0.994) and exist[substitution, VEP:VARIANT_CLASS])"
soft_filter: "False"
af_ad_snv2:
description: "Hard filter SNV variants with low vaf and low ad"
expression: "(FORMAT:AF:0 < 0.004 and FORMAT:AD:1 < 11 and exist[SNV, VEP:VARIANT_CLASS])"
ad_substitution:
description: "Hard filter substitution variants with low ad"
expression: "((FORMAT:AD:1 < 15 or FORMAT:AD:0 < 15) and exist[substitution, VEP:VARIANT_CLASS])"
soft_filter: "False"
af_ad_snv3:
description: "Hard filter SNV variants with low vaf and low ad"
expression: "(FORMAT:AF:0 < 0.005 and FORMAT:AD:1 < 9 and exist[SNV, VEP:VARIANT_CLASS])"
ald:
description: "Hard filter variants with skewed distribution between strands"
expression: "(FORMAT:ALD:0 < 3 or FORMAT:ALD:1 < 3)"
soft_filter: "False"
af_ad_snv4:
description: "Hard filter SNV variants with low vaf and low ad"
expression: "(FORMAT:AF:0 < 0.006 and FORMAT:AD:1 < 7 and exist[SNV, VEP:VARIANT_CLASS])"
sbf:
description: "Hard filter variants with skewed distribution between strands"
expression: "INFO:SBF < 0.01"
soft_filter: "False"
af_ad_snv5:
description: "Hard filter SNV variants with low vaf and low ad"
expression: "(FORMAT:AD:1 < 5 and exist[SNV, VEP:VARIANT_CLASS])"
pmean:
description: "Hard filter variants found only in start of reads"
expression: "INFO:PMEAN < 15.0"
soft_filter: "False"
af_ad_indel1:
description: "Hard filter INDEL variants with low vaf and low ad"
expression: "(FORMAT:AF:0 < 0.005 and !exist[SNV, VEP:VARIANT_CLASS])"
callers:
description: "Hard filter variants only called by mutect2"
expression: "INFO:CALLERS:0 = gatk_mutect2"
soft_filter: "False"
af_ad_indel2:
description: "Hard filter INDEL variants with low vaf and low ad"
expression: "(FORMAT:AF:0 < 0.008 and FORMAT:AD:1 < 14 and !exist[SNV, VEP:VARIANT_CLASS])"
qual:
description: "Hard filter variants with low calling quality"
expression: "INFO:QUAL:0 < 43.0"
soft_filter: "False"
af_ad_indel3:
description: "Hard filter INDEL variants with low vaf and low ad"
expression: "(FORMAT:AD:1 < 5 and !exist[SNV, VEP:VARIANT_CLASS])"
soft_filter: "False"
123 changes: 77 additions & 46 deletions config/filters/config_soft_filter_umi_vep105.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,55 +6,86 @@ filters:
soft_filter: "True"
artifacts:
description: "Hard filter variants found in more than 3 normal samples"
expression: "((INFO:Artifact:0 > 3 and INFO:ArtifactNrSD:0 < 10) or (INFO:Artifact:1 > 3 and INFO:ArtifactNrSD:1 < 10))"
soft_filter_flag: "Artifact_gt_3"
soft_filter: "True"
background:
description: "Hard filter position where background distribution overlaps variant (lower than 4 SD from median)"
expression: "(INFO:PositionNrSD < 0 and !exist[1-hotspot, INFO:Hotspot])"
expression: "((INFO:Artifact:0 > 2 and INFO:ArtifactNrSD:0 < 10) or (INFO:Artifact:0 > 2 and INFO:ArtifactNrSD:1 < 10))"
soft_filter_flag: "Artifact_gt_2"
soft_filter: "True"
germline:
description: "Hard filter germline"
expression: "(VEP:gnomAD_AF > 0.005)"
soft_filter_flag: "germline"
soft_filter: "True"
af_ad_snv1:
description: "Hard filter SNV variants with low vaf and low ad"
expression: "(FORMAT:AF:0 < 0.003 and exist[SNV, VEP:VARIANT_CLASS])"
soft_filter_flag: "af_ad_snv1"
soft_filter: "True"
af_ad_snv2:
description: "Hard filter SNV variants with low vaf and low ad"
expression: "(FORMAT:AF:0 < 0.004 and FORMAT:AD:1 < 11 and exist[SNV, VEP:VARIANT_CLASS])"
soft_filter_flag: "af_ad_snv2"
soft_filter: "True"
af_ad_snv3:
description: "Hard filter SNV variants with low vaf and low ad"
expression: "(FORMAT:AF:0 < 0.005 and FORMAT:AD:1 < 9 and exist[SNV, VEP:VARIANT_CLASS])"
soft_filter_flag: "af_ad_snv3"
soft_filter: "True"
af_ad_snv4:
description: "Hard filter SNV variants with low vaf and low ad"
expression: "(FORMAT:AF:0 < 0.006 and FORMAT:AD:1 < 7 and exist[SNV, VEP:VARIANT_CLASS])"
soft_filter_flag: "af_ad_snv4"
soft_filter: "True"
af_ad_snv5:
description: "Hard filter SNV variants with low vaf and low ad"
expression: "(FORMAT:AD:1 < 5 and exist[SNV, VEP:VARIANT_CLASS])"
soft_filter_flag: "af_ad_snv5"
soft_filter: "True"
af_ad_indel1:
description: "Hard filter INDEL variants with low vaf and low ad"
expression: "(FORMAT:AF:0 < 0.005 and !exist[SNV, VEP:VARIANT_CLASS])"
soft_filter_flag: "af_ad_indel1"
soft_filter: "True"
af_ad_indel2:
description: "Hard filter INDEL variants with low vaf and low ad"
expression: "(FORMAT:AF:0 < 0.008 and FORMAT:AD:1 < 14 and !exist[SNV, VEP:VARIANT_CLASS])"
soft_filter_flag: "af_ad_indel2"
soft_filter: "True"
af_ad_indel3:
description: "Hard filter INDEL variants with low vaf and low ad"
expression: "(FORMAT:AD:1 < 5 and !exist[SNV, VEP:VARIANT_CLASS])"
soft_filter_flag: "af_ad_indel3"
soft_filter: "True"
af_snv:
description: "Hard filter SNV variants with low vaf"
expression: "((FORMAT:AF:0 < 0.006 or FORMAT:AF:0 > 0.994) and exist[SNV, VEP:VARIANT_CLASS])"
soft_filter_flag: "af_snv"
soft_filter: "True"
ad_snv:
description: "Hard filter SNV variants with low ad"
expression: "((FORMAT:AD:1 < 15 or FORMAT:AD:0 < 15) and exist[SNV, VEP:VARIANT_CLASS])"
soft_filter_flag: "ad_snv"
soft_filter: "True"
af_insertion:
description: "Hard filter Insertion variants with low vaf"
expression: "((FORMAT:AF:0 < 0.006 or FORMAT:AF:0 > 0.994) and exist[insertion, VEP:VARIANT_CLASS])"
soft_filter_flag: "af_insertion"
soft_filter: "True"
ad_insertion:
description: "Hard filter Insertion variants with low ad"
expression: "((FORMAT:AD:1 < 15 or FORMAT:AD:0 < 15) and exist[insertion, VEP:VARIANT_CLASS])"
soft_filter_flag: "ad_insertion"
soft_filter: "True"
af_deletion:
description: "Hard filter Deletion variants with low vaf"
expression: "((FORMAT:AF:0 < 0.009 or FORMAT:AF:0 > 0.991) and exist[deletion, VEP:VARIANT_CLASS])"
soft_filter_flag: "af_deletion"
soft_filter: "True"
ad_deletion:
description: "Hard filter Deletion variants with low ad"
expression: "((FORMAT:AD:1 < 20 or FORMAT:AD:0 < 20) and exist[deletion, VEP:VARIANT_CLASS])"
soft_filter_flag: "ad_deletion"
soft_filter: "True"
af_complex:
description: "Hard filter complex variants with low vaf"
expression: "((FORMAT:AF:0 < 0.009 or FORMAT:AF:0 > 0.991) and exist[indel, VEP:VARIANT_CLASS])"
soft_filter_flag: "af_complex"
soft_filter: "True"
ad_complex:
description: "Hard filter complex variants with low ad"
expression: "((FORMAT:AD:1 < 20 or FORMAT:AD:0 < 20) and exist[indel, VEP:VARIANT_CLASS])"
soft_filter_flag: "ad_complex"
soft_filter: "True"
af_substitution:
description: "Hard filter substitution variants with low vaf"
expression: "((FORMAT:AF:0 < 0.006 or FORMAT:AF:0 > 0.994) and exist[substitution, VEP:VARIANT_CLASS])"
soft_filter_flag: "af_substitution"
soft_filter: "True"
ad_substitution:
description: "Hard filter substitution variants with low ad"
expression: "((FORMAT:AD:1 < 15 or FORMAT:AD:0 < 15) and exist[substitution, VEP:VARIANT_CLASS])"
soft_filter_flag: "ad_substitution"
soft_filter: "True"
ald:
description: "Hard filter variants with skewed distribution between strands"
expression: "(FORMAT:ALD:0 < 3 or FORMAT:ALD:1 < 3)"
soft_filter_flag: "ald_skewed"
soft_filter: "True"
sbf:
description: "Hard filter variants with skewed distribution between strands"
expression: "INFO:SBF < 0.01"
soft_filter_flag: "sbf_strand_bias"
soft_filter: "True"
pmean:
description: "Hard filter variants found only in start of reads"
expression: "INFO:PMEAN < 15.0"
soft_filter_flag: "start_of_read"
soft_filter: "True"
callers:
description: "Hard filter variants only called by mutect2"
expression: "INFO:CALLERS:0 = gatk_mutect2"
soft_filter_flag: "only_mutect2"
soft_filter: "True"
qual:
description: "Hard filter variants with low calling quality"
expression: "INFO:QUAL:0 < 43.0"
soft_filter_flag: "calling_qual"
soft_filter: "True"
Loading
Loading