Mercurial > repos > iuc > stacks_ustacks
changeset 3:216c469422d2 draft
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/stacks commit e1c1550e0bd61c88ffead2b1c4f6ab7393052393
| author | iuc |
|---|---|
| date | Sat, 25 Jun 2016 17:28:03 -0400 |
| parents | c2e3eca527c2 |
| children | ff04b3748654 |
| files | macros.xml stacks_ustacks.xml tool_dependencies.xml |
| diffstat | 3 files changed, 22 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/macros.xml Wed Jun 15 06:23:52 2016 -0400 +++ b/macros.xml Sat Jun 25 17:28:03 2016 -0400 @@ -117,11 +117,11 @@ ln -s batch_1.genotypes_*onemap.tsv batch_1.genotypes.onemap.tsv && ln -s batch_1.genotypes_*.onemap.txt batch_1.genotypes.onemap.txt && ln -s batch_1.genomic_*.tsv batch_1.genomic.tsv && - ln -s batch_1.genotypes_1.rqtl.tsv batch_1.genotypes.rqtl.tsv && - ln -s batch_1.haplotypes_1.tsv batch_1.haplotypes.tsv && + ln -s batch_1.genotypes_*.rqtl.tsv batch_1.genotypes.rqtl.tsv && + ln -s batch_1.haplotypes_*.tsv batch_1.haplotypes.tsv && ln -s batch_1.genotypes_*.loc batch_1.genotypes.loc && - ln -s batch_1.genotypes_1.txt batch_1.genotypes.txt && - ln -s batch_1.genotypes_1.tsv batch_1.genotypes.tsv && + ln -s batch_1.genotypes_*.txt batch_1.genotypes.txt && + ln -s batch_1.genotypes_*[^rqtl].tsv batch_1.genotypes.tsv && cd .. ]]> </token>
--- a/stacks_ustacks.xml Wed Jun 15 06:23:52 2016 -0400 +++ b/stacks_ustacks.xml Sat Jun 25 17:28:03 2016 -0400 @@ -1,4 +1,4 @@ -<tool id="stacks_ustacks" name="Stacks: ustacks" version="@WRAPPER_VERSION@.0"> +<tool id="stacks_ustacks" name="Stacks: ustacks" version="@WRAPPER_VERSION@.1"> <description>align short reads into stacks</description> <macros> <import>macros.xml</import> @@ -14,12 +14,12 @@ && #if $sample.ext == "fastqsanger": - #set $data_path = splitext($sample.name)[0] + #set $data_path = splitext($sample.element_identifier)[0] #set $data_path = re.sub(r'\.1$', '', $data_path) #set $data_path = "stacks_inputs/" + $data_path + ".fq" #set inputype = "fastq" #else: - #set $data_path = splitext($sample.name)[0] + #set $data_path = splitext($sample.element_identifier)[0] #set $data_path = re.sub(r'\.1$', '', $data_path) #set $data_path = "stacks_inputs/" + $data_path + ".fa" #set inputype = "fasta" @@ -74,6 +74,8 @@ #end if -o stacks_outputs + + > ustacks.log 2>&1 ]]></command> <inputs> @@ -109,11 +111,13 @@ </inputs> <outputs> + <data format="txt" name="output_log" label="ustacks.log with ${tool.name} on ${on_string}" from_work_dir="ustacks.log" /> + <collection name="tabs" type="list" label="Stacks from ${on_string}"> - <discover_datasets pattern="(?P<name>.+\.tags)\.tsv" ext="tabular" directory="stacks_outputs" /> - <discover_datasets pattern="(?P<name>.+\.snps)\.tsv" ext="tabular" directory="stacks_outputs" />> - <discover_datasets pattern="(?P<name>.+\.alleles)\.tsv" ext="tabular" directory="stacks_outputs" /> - <discover_datasets pattern="(?P<name>.+\.models)\.tsv" ext="tabular" directory="stacks_outputs" /> + <discover_datasets pattern="(?P<name>.+\.tags)\.tsv$" ext="tabular" directory="stacks_outputs" /> + <discover_datasets pattern="(?P<name>.+\.snps)\.tsv$" ext="tabular" directory="stacks_outputs" />> + <discover_datasets pattern="(?P<name>.+\.alleles)\.tsv$" ext="tabular" directory="stacks_outputs" /> + <discover_datasets pattern="(?P<name>.+\.models)\.tsv$" ext="tabular" directory="stacks_outputs" /> </collection> </outputs> @@ -122,6 +126,12 @@ <param name="sample" value="demultiplexed/PopA_01.1.fq" ftype="fastqsanger" /> <param name="sample_id" value="4" /> + <output name="output_log"> + <assert_contents> + <has_text text="done." /> + </assert_contents> + </output> + <output_collection name="tabs"> <element name="PopA_01.tags"> <assert_contents>
--- a/tool_dependencies.xml Wed Jun 15 06:23:52 2016 -0400 +++ b/tool_dependencies.xml Sat Jun 25 17:28:03 2016 -0400 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <tool_dependency> <package name="stacks" version="1.40"> - <repository changeset_revision="95cffefc0dfe" name="package_stacks_1_40" owner="iuc" toolshed="https://toolshed.g2.bx.psu.edu" /> + <repository changeset_revision="51d4ab2c4dcf" name="package_stacks_1_40" owner="iuc" toolshed="https://toolshed.g2.bx.psu.edu" /> </package> <package name="velvet" version="1.2.10"> <repository changeset_revision="93d32326537b" name="package_velvet_1_2_10" owner="devteam" toolshed="https://toolshed.g2.bx.psu.edu" />