diff vsnp_statistics.xml @ 1:14e29f7d59ca draft

Uploaded
author greg
date Wed, 29 Apr 2020 16:56:10 -0400
parents c21d338dbdc4
children 7fe0cbb8c894
line wrap: on
line diff
--- a/vsnp_statistics.xml	Tue Apr 21 10:19:53 2020 -0400
+++ b/vsnp_statistics.xml	Wed Apr 29 16:56:10 2020 -0400
@@ -4,6 +4,8 @@
         <requirement type="package" version="0.5.1">humanize</requirement>
         <requirement type="package" version="1.16.5">numpy</requirement>
         <requirement type="package" version="0.25.3">pandas</requirement>
+        <requirement type="package" version="1.2.0">xlrd</requirement>
+        <requirement type="package" version="1.2.8">xlsxwriter</requirement>
     </requirements>
     <command detect_errors="exit_code"><![CDATA[
 #import os
@@ -13,11 +15,9 @@
 #set input_idxstats_dir = 'input_idxstats'
 #set input_metrics_dir = 'input_metrics'
 #set input_reads_dir = 'input_reads'
-#set output_dir = 'output'
 mkdir -p $input_idxstats_dir &&
 mkdir -p $input_metrics_dir &&
 mkdir -p $input_reads_dir &&
-mkdir -p $output_dir &&
 #if str($input_type) == "single":
     #set read_type_cond = $input_type_cond.read_type_cond
     #set read1 = $read_type_cond.read1
@@ -44,22 +44,21 @@
         #end if
         #set filename = $i.file_name
         #set identifier = re.sub('[^\s\w\-]', '_', str($i.element_identifier))
-        ln -s $filename $input_reads_dir/$identifier &&
+        ln -s '$filename' '$input_reads_dir/$identifier' &&
     #end for
     #for $i in $input_type_cond.samtools_idxstats_collection:
         #set filename = $i.file_name
         #set identifier = re.sub('[^\s\w\-]', '_', str($i.element_identifier))
-        ln -s $filename $input_idxstats_dir/$identifier &&
+        ln -s '$filename' '$input_idxstats_dir/$identifier' &&
     #end for
     #for $i in $input_type_cond.azc_metrics_collection:
         #set dbkey = $i.metadata.dbkey
         #set filename = $i.file_name
         #set identifier = re.sub('[^\s\w\-]', '_', str($i.element_identifier))
-        ln -s $filename $input_metrics_dir/$identifier &&
+        ln -s '$filename' '$input_metrics_dir/$identifier' &&
     #end for
 #end if
 python '$__tool_directory__/vsnp_statistics.py'
---processes $processes
 --dbkey '$dbkey'
 --gzipped '$gzipped'
 #if str($input_type) == "single":
@@ -71,8 +70,8 @@
     #end if
     --samtools_idxstats '$samtools_idxstats'
     --vsnp_azc '$vsnp_azc'
-    --output '$output'
 #end if
+--output '$output'
 ]]></command>
     <inputs>
         <conditional name="input_type_cond">
@@ -107,16 +106,9 @@
                 <param name="azc_metrics_collection" type="data_collection" format="tabular" collection_type="list" label="Collection of vSNP zero-coverage metrics files"/>
             </when>
         </conditional>
-        <param name="processes" type="integer" min="1" max="20" value="8" label="Number of processes for job splitting"/>
     </inputs>
     <outputs>
-        <data name="output" format="tabular">
-            <filter>input_type_cond['input_type'] == 'single'</filter>
-        </data>
-        <collection name="output_collection" type="list">
-            <discover_datasets pattern="__name__" directory="output" format="tabular" />
-            <filter>input_type_cond['input_type'] == 'collection'</filter>
-        </collection>
+        <data name="output" format="xlsx"/>
     </outputs>
     <tests>
         <test>
@@ -124,7 +116,7 @@
             <param name="read2" value="13-1941-6_S4_L001_R2_600000.fastq.gz" ftype="fastqsanger.gz" dbkey="89"/>
             <param name="samtools_idxstats" value="samtools_idxstats.tabular" ftype="tabular" dbkey="89"/>
             <param name="vsnp_azc" value="add_zc_metrics.tabular" ftype="tabular" dbkey="89"/>
-            <output name="output" file="vsnp_statistics.tabular" ftype="tabular" compare="contains"/>
+            <output name="output" file="vsnp_statistics.xlsx" ftype="xlsx" compare="sim_size"/>
         </test>
     </tests>
     <help>
@@ -138,7 +130,6 @@
 **Required options**
 
  * **Choose the type for files to be analyzed** - select "Single files" or "Collections of files", then select the appropriate history items (single or paired fastqsanger reads or collections of fastqsanger reads and associated idxstats and vSNP zero coverage metrics files) based on the selected option..
- * **Number of processes for job splitting** - Select the number of processes for splitting the job to shorten execution time.
     </help>
     <citations>
         <citation type="bibtex">