| Previous changeset 6:bf716cfc3225 (2018-09-07) Next changeset 8:b469ab47b490 (2021-03-23) |
|
Commit message:
"planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/khmer commit 7de685f4763d988a5a9abce4a9c2b4714daaf165" |
|
modified:
filter-below-abund.xml macros.xml |
|
added:
test-data/test-abund-read-2.fa.gz |
| b |
| diff -r bf716cfc3225 -r 569001af897d filter-below-abund.xml --- a/filter-below-abund.xml Fri Sep 07 11:01:54 2018 -0400 +++ b/filter-below-abund.xml Wed Dec 18 16:01:57 2019 -0500 |
| [ |
| @@ -1,4 +1,4 @@ -<tool id="khmer_filter_below_abundance_cutoff" name="Filter reads" version="@WRAPPER_VERSION@.0"> +<tool id="khmer_filter_below_abundance_cutoff" name="khmer: Filter reads" version="@WRAPPER_VERSION@@TOOL_VERSION@"> <description> below k-mer abundance of 50 </description> @@ -6,36 +6,34 @@ <token name="@BINARY@">filter-below-abund.py</token> <import>macros.xml</import> </macros> - <expand macro="requirements" /> + <expand macro="requirements"> + <requirement type="package" version="1.0.1">screed</requirement> + </expand> <expand macro="stdio" /> <command><![CDATA[ - #for $num, $input in enumerate($inputs) - ln -s '${input}' sequence-${num} && - #end for - mkdir output && - cd output && - python '$__tool_directory__/@BINARY@' - '${input_countgraph_filename}' - #for $num, $input in enumerate($inputs) - ../sequence-${num} - #end for - ]]> +@LINK_SEQUENCES@ +mkdir output && +cd output && +python '$__tool_directory__/@BINARY@' +'${input_countgraph_filename}' +@USE_SEQUENCES@ +> '$log' +]]> </command> <inputs> <expand macro="input_sequences_filenames" /> <expand macro="input_countgraph_filename" /> </inputs> <outputs> - <collection name="sequence_files" type="list"> - <discover_datasets pattern="__name__" directory="output" /> - </collection> + <data name="log" format="txt" /> + <expand macro="output_sequences" extension="below"/> </outputs> <tests> <test> <param name="inputs" value="test-abund-read-2.fa" /> <param name="input_countgraph_filename" value="test-abund-read-2.large.oxlicg" ftype="oxlicg" /> - <output_collection name="sequence_files"> - <element name="sequence-0.below" file="test-abund-read-2.fa.below" /> + <output_collection name="sequences"> + <element name="test-abund-read-2.fa" file="test-abund-read-2.fa.below" /> </output_collection> </test> </tests> |
| b |
| diff -r bf716cfc3225 -r 569001af897d macros.xml --- a/macros.xml Fri Sep 07 11:01:54 2018 -0400 +++ b/macros.xml Wed Dec 18 16:01:57 2019 -0500 |
| [ |
| @@ -1,8 +1,10 @@ <macros> - <token name="@WRAPPER_VERSION@">3.0.0a1</token> + <token name="@WRAPPER_VERSION@">3.0.0a3</token> + <token name="@TOOL_VERSION@">+galaxy1</token> <xml name="requirements"> <requirements> <requirement type="package" version="@WRAPPER_VERSION@">khmer</requirement> + <yield/> </requirements> </xml> <xml name="version"> @@ -35,7 +37,7 @@ <option value="specific">Show</option> </param> <when value="simple"> - <param name="tablesize" type="select" label="Sample Type" display="radio"> + <param argument="" name="tablesize" type="select" label="Sample Type" display="radio"> <option value="1e9" selected="true">Microbial Genome</option> <option value="2e9">Animal Transcriptome</option> <option value="4e9">Small Animal Genome or Low-Diversity Metagenome</option> @@ -43,15 +45,32 @@ </param> </when> <when value="specific"> - <param name="ksize" type="integer" value="20" label="k-mer size" help="k-mer size to use" /> - <param name="n_tables" type="integer" min="1" value="4" label="n_tables" help="number of tables to use" /> - <param name="tablesize_specific" type="text" value="1000000.0" + <param argument="--ksize" name="ksize" type="integer" value="20" label="k-mer size" help="k-mer size to use" /> + <param argument="--n_tables" name="n_tables" type="integer" min="1" value="4" label="n_tables" help="number of tables to use" /> + <param argument="--max-tablesize" name="tablesize_specific" type="text" value="1000000.0" label="tablesize" help="(--max-tablesize) upper bound on the tablesize to use" /> </when> </conditional> </xml> + <token name="@LINK_SEQUENCES@"> +<![CDATA[ +#import re +mkdir input/ && +#set gzip="" +#for $num, $input in enumerate($inputs) + ln -s '${input}' 'input/$re.sub("[^\w\-_.]", "_", $input.element_identifier).$input.ext' && + #if str($input).endswith(".gz"): + #set gzip="--gzip" + #end if +#end for]]></token> + <token name="@USE_SEQUENCES@"> +<![CDATA[ +#for $num, $input in enumerate($inputs) + '../input/$re.sub("[^\w\-_.]", "_", $input.element_identifier).$input.ext' +#end for]]></token> + <xml name="input_sequences_filenames"> - <param name="inputs" multiple="true" type="data" format="fasta,fastq" + <param name="inputs" multiple="true" type="data" format="fasta,fastq,fasta.gz,fastq.gz" label="Sequences in FASTA or FASTQ format" help="Put in order of precedence such as longest reads first." /> </xml> @@ -66,27 +85,26 @@ </xml> <xml name="abundance-histogram-output"> <data name="output_histogram_filename" format="txt" - label="${tool.name} k-mer abundance histogram. The + label="${tool.name} on ${on_string}: k-mer abundance histogram. The columns are: (1) k-mer abundance, (2) k-mer count, (3) cumulative count, (4) fraction of total distinct k-mers." /> </xml> - <xml name="output_sequences"> - <data name="output" format_source="inputs" - label="${tool.name} processed nucleotide sequence file"> - <discover_datasets pattern="__designation_and_ext__" directory="output" visible="true"/> - </data> + <xml name="output_sequences" token_extension=""> + <collection name="sequences" type="list"> + <discover_datasets pattern="(?P<name>.*)\.(?P<ext>fast[aq](\.gz)?)\.@EXTENSION@" directory="output" /> + </collection> </xml> <xml name="output_sequences_single"> <data name="output" format_source="input_sequence_filename" - label="${tool.name} processed nucleotide sequence file" /> + label="${tool.name} on ${on_string}: processed nucleotide sequence file" /> </xml> <xml name="input_zero"> - <param name="zero" type="boolean" truevalue="" falsevalue="--no-zero" checked="true" - help="Output zero count bins (--no-zero)" /> + <param argument="--no-zero" name="zero" type="boolean" truevalue="" falsevalue="--no-zero" checked="true" + help="Output zero count bins" /> </xml> <xml name="input_bigcount"> - <param name="bigcount" type="boolean" truevalue="" falsevalue="--no-bigcount" - checked="true" help="Count k-mers past 255 occurences (--no-bigcount)" /> + <param argument="--no-bigcount" name="bigcount" type="boolean" truevalue="" falsevalue="--no-bigcount" + checked="true" help="Count k-mers past 255 occurences" /> </xml> <token name="@HELP_FOOTER@"><![CDATA[ (from the khmer project: http://khmer.readthedocs.org/en/v2.0/ )]]></token> |
| b |
| diff -r bf716cfc3225 -r 569001af897d test-data/test-abund-read-2.fa.gz |
| b |
| Binary file test-data/test-abund-read-2.fa.gz has changed |