| Previous changeset 7:c3fc406e6722 (2017-04-07) Next changeset 9:e5c97f09fe06 (2017-05-21) |
|
Commit message:
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/stacks commit dc23703c260d004a28fe24a2a7c00cb4371bc32e |
|
modified:
macros.xml stacks_ustacks.xml |
|
added:
test-data/demultiplexed/PopA_01.1.fq.gzip test-data/denovo_map/popmap_cstacks.tsv test-data/procrad/R1.fq.gzip test-data/ustacks/ustacks.out |
| b |
| diff -r c3fc406e6722 -r bdad4fb6f85a macros.xml --- a/macros.xml Fri Apr 07 11:47:24 2017 -0400 +++ b/macros.xml Thu Apr 27 04:17:27 2017 -0400 |
| [ |
| @@ -2,14 +2,14 @@ <macros> <xml name="requirements"> <requirements> - <requirement type="package" version="1.42">stacks</requirement> + <requirement type="package" version="1.46">stacks</requirement> <requirement type="package" version="1.2.10">velvet</requirement> - <container type="docker">quay.io/biocontainers/stacks:1.42--2</container> + <requirement type="package" version="1.1">stacks_summary</requirement> <yield/> </requirements> </xml> - <token name="@WRAPPER_VERSION@">1.42</token> + <token name="@WRAPPER_VERSION@">1.46</token> <xml name="stdio"> <stdio> @@ -90,6 +90,7 @@ <option value="bsaHI">bsaHI</option> <option value="hpaII">hpaII</option> <option value="ncoI">ncoI</option> + <option value="ApaLI">ApaLI</option> </xml> <xml name="cross_types"> @@ -100,6 +101,19 @@ <option value="GEN">GEN (generic, unspecific to any map type)</option> </xml> + <token name="@CLEAN_EXT@"> + <![CDATA[ + #from os.path import splitext + #import re + #def clean_ext($identifier) + #while $identifier.endswith(('.1', '.fa', '.fq', '.fasta', '.fastq', '.gz', '.gzip', '.sam', '.bam')) + #set $identifier = splitext($identifier)[0] + #end while +$identifier#slurp + #end def + ]]> + </token> + <token name="@NORM_GENOTYPES_OUTPUT_LIGHT@"> <![CDATA[ ## We need to do this as the output file names contains the value of an option (min progeny) |
| b |
| diff -r c3fc406e6722 -r bdad4fb6f85a stacks_ustacks.xml --- a/stacks_ustacks.xml Fri Apr 07 11:47:24 2017 -0400 +++ b/stacks_ustacks.xml Thu Apr 27 04:17:27 2017 -0400 |
| [ |
| b'@@ -6,26 +6,25 @@\n <expand macro="requirements"/>\n <expand macro="stdio"/>\n <command><![CDATA[\n- #from os.path import splitext\n- #import re\n+\n+ @CLEAN_EXT@\n \n mkdir stacks_inputs stacks_outputs\n \n &&\n \n- #if $sample.is_of_type(\'fastqsanger\'):\n- #set $data_path = splitext($sample.element_identifier)[0]\n- #set $data_path = re.sub(r\'\\.1$\', \'\', $data_path)\n- #set $data_path = "stacks_inputs/" + $data_path + ".fq"\n+ #if $sample.is_of_type(\'fastqsanger\')\n+ #set $data_path = "stacks_inputs/" + $clean_ext($sample.element_identifier) + ".fq"\n #set inputype = "fastq"\n- #else:\n- #set $data_path = splitext($sample.element_identifier)[0]\n- #set $data_path = re.sub(r\'\\.1$\', \'\', $data_path)\n- #set $data_path = "stacks_inputs/" + $data_path + ".fa"\n+ #else if $sample.is_of_type(\'fastqsanger.gz\')\n+ #set $data_path = "stacks_inputs/" + $clean_ext($sample.element_identifier) + ".fq.gz"\n+ #set inputype = "gzfastq"\n+ #else\n+ #set $data_path = "stacks_inputs/" + $clean_ext($sample.element_identifier) + ".fa"\n #set inputype = "fasta"\n #end if\n \n- ln -s "${sample}" "${data_path}"\n+ ln -s \'${sample}\' \'${data_path}\'\n \n &&\n \n@@ -46,26 +45,26 @@\n $H\n \n ## Assembly\n- $assembly_options.r\n+ $assembly_options.keep_high_cov\n $assembly_options.d\n --max_locus_stacks $assembly_options.max_locus_stacks\n- #if str($assembly_options.k_len):\n+ #if str($assembly_options.k_len)\n --k_len $assembly_options.k_len\n #end if\n \n- #if $gapped.use_gapped:\n+ #if $gapped.use_gapped == "yes"\n --gapped\n --max_gaps $gapped.max_gaps\n --min_aln_len $gapped.min_aln_len\n #end if\n \n ## snp_model\n- #if str( $snp_options.select_model.model_type) == "bounded":\n+ #if str( $snp_options.select_model.model_type) == "bounded"\n --model_type bounded\n --bound_low $snp_options.select_model.bound_low\n --bound_high $snp_options.select_model.bound_high\n --alpha $snp_options.select_model.alpha\n- #else if str( $snp_options.select_model.model_type) == "snp":\n+ #else if str( $snp_options.select_model.model_type) == "snp"\n --model_type snp\n --alpha $snp_options.select_model.alpha\n #else\n@@ -75,11 +74,20 @@\n \n -o stacks_outputs\n \n- > ustacks.log 2>&1\n+ 2>&1 | tee ustacks.log\n+\n+ ## If input is in gz format, stacks will output gzipped files (no option to control this)\n+ #if $sample.is_of_type(\'fastqsanger.gz\')\n+ && gunzip stacks_outputs/*.gz\n+ #end if\n+\n+ &&\n+\n+ stacks_summary.py --stacks-prog ustacks --res-dir stacks_outputs --logfile ustacks.log --summary stacks_outputs/summary.html\n ]]></command>\n \n <inputs>\n- <param name="sample" argument="-f" format="fastqsanger,fasta" type="data" label="Input short reads from an individual" />\n+ <param name="sample" argument="-f" format="fastqsanger,fastqsanger.gz,fasta" type="data" label="Input short reads from an individual" />\n \n <param name="m" argument="-m" type="integer" value="2" label="Minimum depth of coverage required to create a stack"/>\n <param name="M" argument="-M" type="integer" value="2" label="Maximum distance (in nucleotides) allowed between stacks"/>\n@@ -87,16 +95,19 @@\n <param name="H" argument="-H" type="boolean" checked="false" truevalue="-H" falsevalue="" label="Disable calling haplotypes from secondary reads" />\n \n <section name="assembly_options" title="SNP Model Options (ustacks option'..b'arby errors. " />\n <param name="d" argument="-d" type="boolean" checked="false" truevalue="-d" falsevalue="" label="Enable the Deleveraging algorithm, used for resolving over merged tags" />\n <param name="max_locus_stacks" argument="--max_locus_stacks" type="integer" value="3" label="Maximum number of stacks at a single de novo locus"/>\n <param name="k_len" argument="--k_len" type="integer" value="" optional="true" label="K-mer size for matching between alleles and loci (automatically calculated by default)"/>\n </section>\n \n <conditional name="gapped">\n- <param name="use_gapped" argument="--gapped" type="boolean" checked="false" label="Perform gapped alignments between stacks" />\n- <when value="false"></when>\n- <when value="true">\n+ <param name="use_gapped" argument="--gapped" type="select" label="Perform gapped alignments between stacks">\n+ <option value="no" selected="true">No</option>\n+ <option value="yes">Yes</option>\n+ </param>\n+ <when value="no"/>\n+ <when value="yes">\n <param name="max_gaps" argument="--max_gaps" type="integer" value="2" label="Number of gaps allowed between stacks before merging"/>\n <param name="min_aln_len" argument="--min_aln_len" type="float" value="0.8" min="0.0" max="1.0" label="Minimum length of aligned sequence in a gapped alignment"/>\n </when>\n@@ -111,6 +122,8 @@\n <outputs>\n <data format="txt" name="output_log" label="ustacks.log with ${tool.name} on ${on_string}" from_work_dir="ustacks.log" />\n \n+ <data format="html" name="output_summary" label="Summary from ${tool.name} on ${on_string}" from_work_dir="stacks_outputs/summary.html" />\n+\n <collection name="tabs" type="list" label="Stacks from ${on_string}">\n <discover_datasets pattern="(?P<name>.+\\.tags)\\.tsv$" ext="tabular" directory="stacks_outputs" />\n <discover_datasets pattern="(?P<name>.+\\.snps)\\.tsv$" ext="tabular" directory="stacks_outputs" />\n@@ -128,6 +141,48 @@\n <has_text text="done." />\n </assert_contents>\n </output>\n+ <output name="output_summary">\n+ <assert_contents>\n+ <has_text text="Stacks Statistics" />\n+ </assert_contents>\n+ </output>\n+\n+ <output_collection name="tabs">\n+ <element name="PopA_01.tags">\n+ <assert_contents>\n+ <has_text text="generated on " />\n+ </assert_contents>\n+ </element>\n+ <element name="PopA_01.snps">\n+ <assert_contents>\n+ <has_text text="generated on " />\n+ </assert_contents>\n+ </element>\n+ <element name="PopA_01.alleles">\n+ <assert_contents>\n+ <has_text text="generated on " />\n+ </assert_contents>\n+ </element>\n+ <element name="PopA_01.models">\n+ <assert_contents>\n+ <has_text text="generated on " />\n+ </assert_contents>\n+ </element>\n+ </output_collection>\n+ </test>\n+ <test>\n+ <param name="sample" value="demultiplexed/PopA_01.1.fq.gzip" ftype="fastqsanger.gz" />\n+\n+ <output name="output_log">\n+ <assert_contents>\n+ <has_text text="done." />\n+ </assert_contents>\n+ </output>\n+ <output name="output_summary">\n+ <assert_contents>\n+ <has_text text="Stacks Statistics" />\n+ </assert_contents>\n+ </output>\n \n <output_collection name="tabs">\n <element name="PopA_01.tags">\n' |
| b |
| diff -r c3fc406e6722 -r bdad4fb6f85a test-data/demultiplexed/PopA_01.1.fq.gzip |
| b |
| Binary file test-data/demultiplexed/PopA_01.1.fq.gzip has changed |
| b |
| diff -r c3fc406e6722 -r bdad4fb6f85a test-data/denovo_map/popmap_cstacks.tsv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/denovo_map/popmap_cstacks.tsv Thu Apr 27 04:17:27 2017 -0400 |
| b |
| @@ -0,0 +1,1 @@ +PopA_01 myPopA |
| b |
| diff -r c3fc406e6722 -r bdad4fb6f85a test-data/procrad/R1.fq.gzip |
| b |
| Binary file test-data/procrad/R1.fq.gzip has changed |
| b |
| diff -r c3fc406e6722 -r bdad4fb6f85a test-data/ustacks/ustacks.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/ustacks/ustacks.out Thu Apr 27 04:17:27 2017 -0400 |
| b |
| @@ -0,0 +1,41 @@ +ustacks parameters selected: + Sample ID: 1 + Min depth of coverage to create a stack: 2 + Max distance allowed between stacks: 2 + Max distance allowed to align secondary reads: 4 + Max number of stacks allowed per de novo locus: 3 + Deleveraging algorithm: disabled + Removal algorithm: enabled + Model type: SNP + Alpha significance level for model: 0.05 + Gapped alignments: disabled +Parsing stacks_inputs/PopA_01.fq +Loading RAD-Tags...done +Loaded 66 RAD-Tags. + Inserted 7 elements into the RAD-Tags hash map. + 0 reads contained uncalled nucleotides that were modified. +4 initial stacks were populated; 3 stacks were set aside as secondary reads. +Initial coverage mean: 15.75; Std Dev: 7.46241; Max: 27 +Deleveraging trigger: 23; Removal trigger: 31 +Calculating distance for removing repetitive stacks. + Distance allowed between stacks: 1; searching with a k-mer length of 47 (48 k-mers per read); 1 k-mer hits required. +Removing repetitive stacks. + Removed 0 stacks. + 4 stacks remain for merging. +Post-Repeat Removal, coverage depth Mean: 15.75; Std Dev: 7.46241; Max: 27 +Calculating distance between stacks... + Distance allowed between stacks: 2; searching with a k-mer length of 31 (64 k-mers per read); 2 k-mer hits required. +Merging stacks, maximum allowed distance: 2 nucleotide(s) + 4 stacks merged into 3 loci; deleveraged 0 loci; blacklisted 0 loci. +After merging, coverage depth Mean: 21; Std Dev: 4.24264; Max: 27 +Merging remainder radtags + 3 remainder sequences left to merge. + Distance allowed between stacks: 4; searching with a k-mer length of 17 (78 k-mers per read); 10 k-mer hits required. + Matched 3 remainder reads; unable to match 0 remainder reads. +After remainders merged, coverage depth Mean: 22; Std Dev: 4.32049; Max: 28 +Calling final consensus sequences, invoking SNP-calling model... +Number of utilized reads: 66 +Writing loci, SNPs, and alleles to 'stacks_outputs/'... + Refetching sequencing IDs from stacks_inputs/PopA_01.fq... read 66 sequence IDs. +done. +ustacks is done. |