| Previous changeset 1:9919057a466c (2020-10-29) Next changeset 3:d2590fe6793f (2021-12-14) |
|
Commit message:
"planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/delly commit d18d984264f54b45e94d97b5b97ed499a32a334a" |
|
modified:
filter.xml macros.xml |
| b |
| diff -r 9919057a466c -r 6184cfc70e28 filter.xml --- a/filter.xml Thu Oct 29 20:50:57 2020 +0000 +++ b/filter.xml Fri Jan 22 14:32:03 2021 +0000 |
| [ |
| b'@@ -8,12 +8,12 @@\n <expand macro="version_command"/>\n <command detect_errors="exit_code"><![CDATA[\n ## initialize\n-#if $samples.is_of_type(\'vcf\')\n- bcftools view -Ob \'$samples\' > \'sample.bcf.gz\' &&\n- bcftools index \'sample.bcf.gz\' &&\n+#if $input.is_of_type(\'vcf\')\n+ bcftools view -Ob \'$input\' > \'input.bcf.gz\' &&\n+ bcftools index \'input.bcf.gz\' &&\n #else\n- ln -s \'${samples}\' \'sample.bcf.gz\' &&\n- ln -s \'${samples.metadata.bcf_index}\' \'sample.bcf.gz.csi\' &&\n+ ln -s \'${input}\' \'input.bcf.gz\' &&\n+ ln -s \'${input.metadata.bcf_index}\' \'input.bcf.gz.csi\' &&\n #end if\n \n ## run\n@@ -31,38 +31,37 @@\n --samples \'$sv.mode_cond.samples\'\n --coverage $sv.mode_cond.coverage\n --controlcontamination $sv.mode_cond.controlcontamination\n-#end if\n ## germline options\n-#if $sv.mode_cond.mode_sel == \'germline\'\n+#else if $sv.mode_cond.mode_sel == \'germline\'\n --gq $sv.mode_cond.gq\n --rddel $sv.mode_cond.rddel\n --rddup $sv.mode_cond.rddup\n #end if\n-## samples\n-\'sample.bcf.gz\' ## input\n+## input\n+\'input.bcf.gz\'\n \n ## postprocessing\n @LOG@\n @VCF@\n ]]></command>\n <inputs>\n- <expand macro="samples" format="bcf,vcf" multiple="false" label="Select file"/>\n+ <expand macro="input" format="bcf,vcf" label="Select input file"/>\n <section name="generic" title="Generic options" expanded="true">\n <param argument="--altaf" type="float" value="0.2" min="0.0" max="1.0" label="Set minimum fractional ALT support"/>\n- <expand macro="minsize"/>\n- <expand macro="maxsize" default="500000000"/>\n+ <expand macro="minsize" default="0" label="Set minimum SV size"/>\n+ <expand macro="maxsize" default="500000000" label="Set maximum SV size"/>\n <param argument="--ratiogeno" type="float" value="0.75" min="0.0" max="1.0" label="Set minimum fraction of genotyped samples"/>\n <param argument="--pass" type="boolean" truevalue="--pass" falsevalue="" label="Filter sites for PASS?"/>\n </section>\n <section name="sv" title="SV calling options" expanded="true">\n <conditional name="mode_cond">\n- <param argument="mode_sel" type="select" label="Select filter mode">\n+ <param name="mode_sel" type="select" label="Select filter mode" help="(--filter)">\n <option value="somatic" selected="true">Somatic</option>\n <option value="germline">Germline</option>\n </param>\n <when value="somatic">\n- <param argument="--samples" type="data" format="tabular" label="Select sample file" help="Two-column sample file listing sample name and tumor or control."/>\n- <param argument="--coverage" type="integer" value="10" label="Set minimum coverage in tumor."/>\n+ <expand macro="samples"/>\n+ <expand macro="coverage" label="Set minimum coverage in tumor"/>\n <param argument="--controlcontamination" type="float" value="0.0" min="0.0" max="1.0" label="Set maximum fractional ALT support in control"/>\n </when>\n <when value="germline">\n@@ -72,23 +71,23 @@\n </when>\n </conditional>\n </section>\n- <section name="oo" title="Output options">\n+ <section name="oo" title="Output options" expanded="true">\n <param name="out" type="select" multiple="true" optional="false" label="Select output file(s)">\n <option value="bcf" selected="true">BCF</option>\n+ <option value="log">Log</option>\n <option value="vcf">VCF</option>\n- <option value="log">Log</option>\n </param>\n </section>\n </inputs>\n <outputs>\n- <expand macro="vcf"/>\n <expand macro="bcf"/>\n <expand macro="log"/>\n+ <expand macro="vcf"/>\n </outputs>\n <tests>\n <!-- #1 default, somatic, b'..b'="call_1.bcf.gz"/>\n+ <param name="input" value="call_1.bcf.gz"/>\n <section name="generic">\n <param name="altaf" value="0.3"/>\n <param name="minsize" value="1"/>\n@@ -137,6 +136,11 @@\n <has_size value="2281" delta="10"/>\n </assert_contents>\n </output>\n+ <output name="out_log">\n+ <assert_contents>\n+ <has_text_matching expression=".+Done\\."/>\n+ </assert_contents>\n+ </output>\n <output name="out_vcf">\n <assert_contents>\n <has_n_lines n="140"/>\n@@ -144,15 +148,10 @@\n <has_line line="#CHROM	POS	ID	REF	ALT	QUAL	FILTER	INFO	FORMAT	NORMAL	TUMOR"/>\n </assert_contents>\n </output>\n- <output name="out_log">\n- <assert_contents>\n- <has_text_matching expression=".+Done\\."/>\n- </assert_contents>\n- </output>\n </test>\n <!-- #3 default, germline, bcf -->\n <test expect_num_outputs="2">\n- <param name="samples" value="call_1.bcf.gz"/>\n+ <param name="input" value="call_1.bcf.gz"/>\n <section name="sv">\n <conditional name="mode_cond">\n <param name="mode_sel" value="germline"/>\n@@ -176,7 +175,7 @@\n </test>\n <!-- #4 germline, bcf -->\n <test expect_num_outputs="3">\n- <param name="samples" value="call_1.bcf.gz"/>\n+ <param name="input" value="call_1.bcf.gz"/>\n <section name="generic">\n <param name="altaf" value="0.1"/>\n <param name="minsize" value="1"/>\n@@ -200,6 +199,11 @@\n <has_size value="2264" delta="10"/>\n </assert_contents>\n </output>\n+ <output name="out_log">\n+ <assert_contents>\n+ <has_text_matching expression=".+Done\\."/>\n+ </assert_contents>\n+ </output>\n <output name="out_vcf">\n <assert_contents>\n <has_n_lines n="139"/>\n@@ -207,15 +211,10 @@\n <has_line line="#CHROM	POS	ID	REF	ALT	QUAL	FILTER	INFO	FORMAT	NORMAL	TUMOR"/>\n </assert_contents>\n </output>\n- <output name="out_log">\n- <assert_contents>\n- <has_text_matching expression=".+Done\\."/>\n- </assert_contents>\n- </output>\n </test>\n <!-- #5 default, somatic, vcf -->\n <test expect_num_outputs="2">\n- <param name="samples" value="call_1.vcf.gz"/>\n+ <param name="input" value="call_1.vcf.gz"/>\n <section name="sv">\n <conditional name="mode_cond">\n <param name="mode_sel" value="somatic"/>\n@@ -227,7 +226,7 @@\n </section>\n <output name="out_bcf">\n <assert_contents>\n- <has_size value="2440" delta="10"/>\n+ <has_size value="2451" delta="10"/>\n </assert_contents>\n </output>\n <output name="out_vcf">\n@@ -246,8 +245,6 @@\n \n @WID@\n \n-Delly *filter* contains workflows for germline and somatic SV calling.\n-\n **Input**\n \n *Somatic* filtering requires a called SV input with at least one tumor sample and a matched control sample. In addition, a tab-delimited sample description needs to be provided, in which the first column holds the sample ids (as found in the VCF/BCF input) and the second column specifies either tumor or control.\n@@ -256,7 +253,7 @@\n \n **Output**\n \n-The output is available in BCF and VCF format.\n+The output is available in BCF and VCF format. Additionally a log file is provided.\n \n .. class:: infomark\n \n' |
| b |
| diff -r 9919057a466c -r 6184cfc70e28 macros.xml --- a/macros.xml Thu Oct 29 20:50:57 2020 +0000 +++ b/macros.xml Fri Jan 22 14:32:03 2021 +0000 |
| [ |
| @@ -1,6 +1,6 @@ <?xml version="1.0"?> <macros> - <token name="@TOOL_VERSION@">0.8.5</token> + <token name="@TOOL_VERSION@">0.8.7</token> <token name="@VERSION_SUFFIX@">0</token> <xml name="requirements"> <requirements> @@ -17,14 +17,12 @@ </citations> </xml> - <!-- - command - --> + <!-- command --> <token name="@BAM@"><![CDATA[ -#for $i, $current in enumerate($samples) - ln -s '${current}' 'sample_${i}.bam' && - ln -s '${current.metadata.bam_index}' 'sample_${i}.bam.bai' && +#for $i, $current in enumerate($input) + ln -s '${current}' 'input_${i}.bam' && + ln -s '${current.metadata.bam_index}' 'input_${i}.bam.bai' && #end for ]]></token> <token name="@DUMP@"><![CDATA[ @@ -43,68 +41,79 @@ #end if ]]></token> - <!-- - input - --> + <!-- input --> + <xml name="cnoffset" token_default=""> + <param name="cnoffset" type="float" min="0.0" max="1.0" value="@DEFAULT@" label="Set minimum CN offset" help="(--cn-offset)"/> + </xml> + <xml name="coverage" token_label=""> + <param argument="--coverage" type="integer" value="10" label="@LABEL@"/> + </xml> <xml name="exclude"> <param argument="--exclude" type="data" format="tabular" optional="true" label="Select file with regions to exclude"/> </xml> <xml name="genome"> - <param argument="--genome" type="data" format="fasta" label="Select genome"/> + <param argument="--genome" type="data" format="fasta" label="Select genome file"/> </xml> <xml name="genoqual"> <param name="genoqual" type="integer" value="5" label="Set minimum mapping quality for genotyping" help="(--geno-qual)"/> </xml> + <xml name="input" token_format="" token_multiple="false" token_label=""> + <param name="input" type="data" format="@FORMAT@" multiple="@MULTIPLE@" label="@LABEL@"/> + </xml> + <xml name="maxreadsep" token_default=""> + <param argument="--maxreadsep" type="integer" value="@DEFAULT@" label="Set maximum read separation"/> + </xml> + <xml name="maxsize" token_default="" token_label=""> + <param argument="--maxsize" type="integer" value="@DEFAULT@" label="@LABEL@"/> + </xml> <xml name="minclip"> <param argument="--minclip" type="integer" value="25" label="Set minimum clipping length"/> </xml> - <xml name="maxreadsep" token_default="40"> - <param argument="--maxreadsep" type="integer" value="@DEFAULT@" label="Set maximum read separation"/> + <xml name="mincliquesize"> + <param name="mincliquesize" type="integer" value="2" label="Set minimum paired-end/single-read clique size" help="(--min-clique-size)"/> </xml> - <xml name="maxsize" token_default="1000000"> - <param argument="--maxsize" type="integer" value="@DEFAULT@" label="Set maximum SV size"/> - </xml> - <xml name="mincliquesize"> - <param name="mincliquesize" type="integer" value="2" label="Set minimum min. PE/SR clique size" help="(--min-clique-size)"/> - </xml> - <xml name="minrefsep" token_default="25"> + <xml name="minrefsep" token_default=""> <param argument="--minrefsep" type="integer" value="@DEFAULT@" label="Set minimum reference separation"/> </xml> - <xml name="minsize"> - <param argument="--minsize" type="integer" value="0" label="Set minimum SV size"/> + <xml name="minsize" token_default="" token_label=""> + <param argument="--minsize" type="integer" value="@DEFAULT@" label="@LABEL@"/> + </xml> + <xml name="pass"> + <param argument="--pass" type="boolean" truevalue="--pass" falsevalue="" label="Filter sites for PASS?"/> </xml> - <xml name="samples" token_format="bam" token_multiple="true" token_label="Select sample file(s)"> - <param name="samples" type="data" format="@FORMAT@" multiple="@MULTIPLE@" label="@LABEL@"/> + <xml name="ploidy"> + <param argument="--ploidy" type="integer" value="2" label="Set baseline ploidy"/> + </xml> + <xml name="samples"> + <param argument="--samples" type="data" format="tabular" label="Select sample file" help="Two-column sample file listing sample name and tumor or control."/> </xml> <xml name="svtype"> <param argument="--svtype" type="select" label="Select type(s) of structural variants to detect"> <option value="ALL" selected="true">All types (ALL)</option> <option value="DEL">Deletion (DEL)</option> + <option value="DUP">Duplication (DUP)</option> <option value="INS">Insertion (INS)</option> - <option value="DUP">Duplication (DUP)</option> <option value="INV">Inversion (INV)</option> <option value="BND">Translocation (BND)</option> </param> </xml> <xml name="vcffile"> - <param argument="--vcffile" type="data" format="vcf,bcf" optional="true" label="Select genotyping file"/> + <param argument="--vcffile" type="data" format="bcf,vcf" optional="true" label="Select genotyping file"/> </xml> - <!-- - output - --> + <!-- output --> + <xml name="bcf"> + <data name="out_bcf" format="bcf" from_work_dir="result.bcf" label="${tool.name} on ${on_string}: Result (BCF)"> + <filter>'bcf' in oo['out']</filter> + </data> + </xml> <xml name="vcf"> <data name="out_vcf" format="vcf" from_work_dir="result.vcf" label="${tool.name} on ${on_string}: Result (VCF)"> <filter>'vcf' in oo['out']</filter> </data> </xml> - <xml name="bcf"> - <data name="out_bcf" format="bcf" from_work_dir="result.bcf" label="${tool.name} on ${on_string}: Result (BCF)"> - <filter>'bcf' in oo['out']</filter> - </data> - </xml> <xml name="dump"> <data name="out_dump" format="tabular" from_work_dir="dump.tsv" label="${tool.name} on ${on_string}: SV-reads"> <filter>'dump' in oo['out']</filter> @@ -116,12 +125,25 @@ </data> </xml> - <!-- - Help - --> + <!-- help --> <token name="@WID@"><![CDATA[ Delly is an integrated structural variant (SV) prediction method that can discover, genotype and visualize deletions, tandem duplications, inversions and translocations at single-nucleotide resolution in short-read massively parallel sequencing data. It uses paired-ends, split-reads and read-depth to sensitively and accurately delineate genomic rearrangements throughout the genome. + +Short-read SV calling + +- *call* to discover and genotype structural variants +- *merge* structural variants across VCF/BCF files and within a single VCF/BCF file +- *filter* somatic or germline structural variants + +Long-read SV calling + +- *lr* for long-read SV discovery + +Copy-number variant calling + +- *cnv* to discover and genotype copy-number variants +- *classify* somatic or germline copy-number variants ]]></token> <token name="@REFERENCES@"><![CDATA[ More information are available on `GitHub <https://github.com/dellytools/delly>`_. |