# HG changeset patch
# User wolma
# Date 1423664623 18000
# Node ID 72d20758ba2cb44e05d4fb70271f4707dae3a66b
# Parent  a548b3c6ed00b07862ce70239401f2628d347769
final upload

diff -r a548b3c6ed00 -r 72d20758ba2c annotate_variants.xml
--- a/annotate_variants.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/annotate_variants.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,8 +1,9 @@
 <tool id="annotate_variants" name="Variant Annotation">
   <description>Predict the effects of SNPs and indels on known genes in the reference genome using SnpEff</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command>
   	mimodd annotate
diff -r a548b3c6ed00 -r 72d20758ba2c bamsort.xml
--- a/bamsort.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/bamsort.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,8 +1,9 @@
 <tool id="bamsort" name="Sort BAM file">
   <description>Sort a BAM file by coordinates (or names) of the mapped reads</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command>
 	mimodd sort "$inputfile" -o "$output" --oformat $oformat $by_name
diff -r a548b3c6ed00 -r 72d20758ba2c cloudmap.xml
--- a/cloudmap.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/cloudmap.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,8 +1,9 @@
 <tool id="cloudmap_prepare" name="Prepare variant data for mapping">
   <description>with the CloudMap series of tools.</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command>
     mimodd cloudmap "$ifile" ${run.mode} 
diff -r a548b3c6ed00 -r 72d20758ba2c convert.xml
--- a/convert.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/convert.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,8 +1,9 @@
 <tool id="convert" name="Convert">
   <description>between different sequence data formats</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command>
 	mimodd convert 
diff -r a548b3c6ed00 -r 72d20758ba2c covstats.xml
--- a/covstats.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/covstats.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,8 +1,9 @@
 <tool id="coverage_stats" name="Coverage Statistics">
   <description>Calculate coverage statistics for a BCF file as generated by the Variant Calling tool</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command> 
 	mimodd covstats "$ifile" --ofile "$output_vcf"
diff -r a548b3c6ed00 -r 72d20758ba2c deletion_predictor.xml
--- a/deletion_predictor.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/deletion_predictor.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,8 +1,9 @@
 <tool id="deletion_prediction" name="Deletion Prediction for paired-end data">
   <description>Predicts deletions in one or more aligned read samples based on coverage of the reference genome and on insert sizes</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command>
     mimodd delcall
diff -r a548b3c6ed00 -r 72d20758ba2c fileinfo.xml
--- a/fileinfo.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/fileinfo.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,8 +1,9 @@
 <tool id="fileinfo" name="Retrieve File Information">
   <description>for supported data formats.</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command>
     mimodd info "$ifile" -o "$outputfile" --verbose --oformat $oformat
diff -r a548b3c6ed00 -r 72d20758ba2c reheader.xml
--- a/reheader.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/reheader.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,9 +1,10 @@
 <tool id="reheader" name="Reheader BAM file">
 
   <description>From a BAM file generate a new file with the original header (if any) replaced or modified by that found in a second SAM file</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command>    
     #if ($str($rg.treat_rg) != "ignore" and $str($rg.rginfo.source) == "from_form") or $str($co.treat_co) != "ignore":
diff -r a548b3c6ed00 -r 72d20758ba2c sam_header.xml
--- a/sam_header.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/sam_header.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,8 +1,9 @@
 <tool id="ngs_run_annotation" name="NGS Run Annotation">
   <description>Create a SAM format header from run metadata for sample annotation.</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command>
   	mimodd header
diff -r a548b3c6ed00 -r 72d20758ba2c snap_caller.xml
--- a/snap_caller.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/snap_caller.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,8 +1,9 @@
 <tool id="read_alignment" name="SNAP Read Alignment">
   <description>Map sequence reads to a reference genome using SNAP</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command> 
 	mimodd snap-batch -s
diff -r a548b3c6ed00 -r 72d20758ba2c snp_caller_caller.xml
--- a/snp_caller_caller.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/snp_caller_caller.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,8 +1,9 @@
 <tool id="variant_calling" name="Variant Calling">
   <description>From a reference and aligned reads generate a BCF file with position-specific variant likelihoods and coverage information</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command>
 	mimodd varcall
diff -r a548b3c6ed00 -r 72d20758ba2c snpeff_genomes.xml
--- a/snpeff_genomes.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/snpeff_genomes.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,8 +1,9 @@
 <tool id="snpeff_genomes" name="List Installed SnpEff Genomes">
   <description>Checks the local SnpEff installation to compile a list of currently installed genomes</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command>
   	mimodd snpeff-genomes -o "$outputfile"
diff -r a548b3c6ed00 -r 72d20758ba2c toolshed_macros.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolshed_macros.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -0,0 +1,7 @@
+<macros>
+  <xml name="requirements">
+    <requirements>
+      <requirement type="package" version="0.1.5.2">mimodd</requirement>
+    </requirements>
+  </xml>
+</macros>
diff -r a548b3c6ed00 -r 72d20758ba2c varextract.xml
--- a/varextract.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/varextract.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,8 +1,9 @@
 <tool id="extract_variants" name="Extract Variant Sites">
   <description>from a BCF file</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command> 
 	mimodd varextract "$ifile"
diff -r a548b3c6ed00 -r 72d20758ba2c vcf_filter.xml
--- a/vcf_filter.xml	Wed Feb 11 08:57:11 2015 -0500
+++ b/vcf_filter.xml	Wed Feb 11 09:23:43 2015 -0500
@@ -1,8 +1,9 @@
 <tool id="vcf_filter" name="VCF Filter">
   <description>Extracts lines from a vcf variant file based on field-specific filters</description>
-  <requirements>
-    <requirement type="package">mimodd</requirement>
-  </requirements>
+  <macros>
+    <import>toolshed_macros.xml</import>
+  </macros>
+  <expand macro="requirements"/>
   <version_command>mimodd version -q</version_command>
   <command> 
 	mimodd vcf-filter