Mercurial > repos > sanbi-uwc > trimmomatic

changeset 4:642a39a927c9 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/SANBI-SA/galaxy-tools/tree/master/tools/trimmomatic commit b30cac62484ba664a19a02a6817752f4f2b140bf
author sanbi-uwc
date Mon, 23 Jan 2017 07:46:47 -0500
parents f6cb99d6afd3
children 069b6b601fad
files README.rst package_trimmomatic.sh tool_dependencies.xml trimmomatic.sh trimmomatic.xml trimmomatic.xml.orig trimmomatic_BACKUP_16831.sh trimmomatic_BACKUP_16925.sh trimmomatic_BASE_16831.sh trimmomatic_BASE_16925.sh trimmomatic_LOCAL_16831.sh trimmomatic_LOCAL_16925.sh trimmomatic_REMOTE_16831.sh trimmomatic_REMOTE_16925.sh trimmomatic_macros.xml
diffstat 13 files changed, 628 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/README.rst	Mon Jan 23 06:31:29 2017 -0500
+++ b/README.rst	Mon Jan 23 07:46:47 2017 -0500
@@ -58,6 +58,8 @@
 ========== ======================================================================
 Version    Changes
 ---------- ----------------------------------------------------------------------
+0.36.1     - Reimplement to work with bioconda Trimmomatic 0.36 (toolshed version
+             is still supported for now).
 0.36.0     - Update to Trimmomatic 0.36.
 0.32.4     - Add support for ``AVGQUAL`` and ``MAXINFO`` operations.
 0.32.3     - Add support for FASTQ R1/R2 pairs using dataset collections (input
--- a/package_trimmomatic.sh	Mon Jan 23 06:31:29 2017 -0500
+++ b/package_trimmomatic.sh	Mon Jan 23 07:46:47 2017 -0500
@@ -11,7 +11,7 @@
 tar cvzf $TGZ \
     README.rst \
     trimmomatic.xml \
-    trimmomatic.sh \
+    trimmomatic_macros.xml \
     tool_dependencies.xml \
     test-data
 if [ -f $TGZ ] ; then
--- a/tool_dependencies.xml	Mon Jan 23 06:31:29 2017 -0500
+++ b/tool_dependencies.xml	Mon Jan 23 07:46:47 2017 -0500
@@ -4,7 +4,7 @@
       <install version="1.0">
 	<actions>
 	  <action type="download_by_url">http://www.usadellab.org/cms/uploads/supplementary/Trimmomatic/Trimmomatic-0.36.zip</action>
-	  <action type="move_file">
+	  <action type="move_file" rename_to="trimmomatic.jar">
 	    <source>trimmomatic-0.36.jar</source>
 	    <destination>$INSTALL_DIR</destination>
 	  </action>
@@ -13,10 +13,10 @@
             <destination_directory>$INSTALL_DIR/adapters</destination_directory>
           </action>
 	  <action type="set_environment">
-	    <environment_variable name="TRIMMOMATIC_DIR" action="set_to">$INSTALL_DIR</environment_variable>
+	    <environment_variable name="TRIMMOMATIC_JAR_PATH" action="set_to">$INSTALL_DIR</environment_variable>
 	  </action>
 	  <action type="set_environment">
-	    <environment_variable name="TRIMMOMATIC_ADAPTERS_DIR" action="set_to">$INSTALL_DIR/adapters</environment_variable>
+	    <environment_variable name="TRIMMOMATIC_ADAPTERS_PATH" action="set_to">$INSTALL_DIR/adapters</environment_variable>
 	  </action>
 	</actions>
       </install>
--- a/trimmomatic.sh	Mon Jan 23 06:31:29 2017 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# Shell wrapper to run Trimmomatic jar file as a Galaxy tool
-echo Arguments:
-for i in $@ ; do
-    echo "*" $i
-done
-
-if [ -n "$CONDA_PREFIX" ] ; then
-  # bioconda installs trimmomatic in a share directory
-  # with a jarfile called trimmomatic.jar
-  TRIMMOMATIC_DIR="$CONDA_PREFIX/share/trimmomatic"
-  JARFILE="trimmomatic.jar"
-else
-  JARFILE="trimmomatic-0.36.jar"
-fi
-
-if [ -z "$TRIMMOMATIC_DIR" ] ; then
-  echo "TRIMMOMATIC_DIR variable not set, can't find jar file"
-  exit 1
-fi
-
-java -mx16G -jar $TRIMMOMATIC_DIR/$JARFILE $@ 2>&1 | tee trimmomatic.log
-status=$?
-echo "Exit status: $status"
-# Check for successful completion
-if [ -z "$(tail -1 trimmomatic.log | grep "Completed successfully")" ] ; then
-    echo "Trimmomatic did not finish successfully" >&2
-    exit 1
-fi
-exit $status
-##
-#
--- a/trimmomatic.xml	Mon Jan 23 06:31:29 2017 -0500
+++ b/trimmomatic.xml	Mon Jan 23 07:46:47 2017 -0500
@@ -1,5 +1,8 @@
 <tool id="trimmomatic" name="Trimmomatic" version="0.36.3">
   <description>flexible read trimming tool for Illumina NGS data</description>
+  <macros>
+    <import>trimmomatic_macros.xml</import>
+  </macros>
   <requirements>
     <requirement type="package" version="0.36">trimmomatic</requirement>
   </requirements>
@@ -17,7 +20,9 @@
   #else
     ln -s '$fastq_in' fastq_in.'$fastq_in.extension' &&
   #end if
-  bash '${__tool_directory__}/trimmomatic.sh'
+  @CONDA_TRIMMOMATIC_JAR_PATH@ &&
+  @CONDA_TRIMMOMATIC_ADAPTERS_PATH@ &&
+  java -mx16G -jar \$TRIMMOMATIC_JAR_PATH/trimmomatic.jar
   #if $readtype.single_or_paired in ["pair_of_files","collection"]
     PE -threads \${GALAXY_SLOTS:-6} -phred33
       fastq_r1.'$r1_ext' fastq_r2.'$r2_ext'
@@ -28,7 +33,7 @@
   #end if
   ## ILLUMINACLIP option
   #if $illuminaclip.do_illuminaclip
-    ILLUMINACLIP:\$TRIMMOMATIC_ADAPTERS_DIR/$illuminaclip.adapter_fasta:$illuminaclip.seed_mismatches:$illuminaclip.palindrome_clip_threshold:$illuminaclip.simple_clip_threshold
+    ILLUMINACLIP:\$TRIMMOMATIC_ADAPTERS_PATH/$illuminaclip.adapter_fasta:$illuminaclip.seed_mismatches:$illuminaclip.palindrome_clip_threshold:$illuminaclip.simple_clip_threshold
   #end if
   ## Other operations
   #for $op in $operations
@@ -81,19 +86,19 @@
            <option value="pair_of_files">Paired-end (two separate input files)</option>
            <option value="collection">Paired-end (as collection)</option>
         </param>
-    <when value="se">
-      <param name="fastq_in" type="data" format="fastqsanger,fastqsanger.gz" label="Input FASTQ file" />
-    </when>
-    <when value="pair_of_files">
-      <param name="fastq_r1_in" type="data" format="fastqsanger,fastqsanger.gz"
-         label="Input FASTQ file (R1/first of pair)" />
-      <param name="fastq_r2_in" type="data" format="fastqsanger,fastqgsanger.gz"
-         label="Input FASTQ file (R2/second of pair)" />
-    </when>
-        <when value="collection">
-          <param name="fastq_pair" format="fastqsanger,fastqsanger.gz" type="data_collection" collection_type="paired" label="Select FASTQ dataset collection with R1/R2 pair" />
-        </when>
-      </conditional>
+      <when value="se">
+        <param name="fastq_in" type="data" format="fastqsanger,fastqsanger.gz" label="Input FASTQ file" />
+      </when>
+      <when value="pair_of_files">
+        <param name="fastq_r1_in" type="data" format="fastqsanger,fastqsanger.gz"
+           label="Input FASTQ file (R1/first of pair)" />
+        <param name="fastq_r2_in" type="data" format="fastqsanger,fastqgsanger.gz"
+           label="Input FASTQ file (R2/second of pair)" />
+      </when>
+      <when value="collection">
+        <param name="fastq_pair" format="fastqsanger,fastqsanger.gz" type="data_collection" collection_type="paired" label="Select FASTQ dataset collection with R1/R2 pair" />
+      </when>
+    </conditional>
     <conditional name="illuminaclip">
     <param name="do_illuminaclip" type="boolean" label="Perform initial ILLUMINACLIP step?" help="Cut adapter and other illumina-specific sequences from the read" truevalue="yes" falsevalue="no" checked="False" />
     <when value="yes">
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trimmomatic.xml.orig	Mon Jan 23 07:46:47 2017 -0500
@@ -0,0 +1,426 @@
+<<<<<<< HEAD
+<tool id="trimmomatic" name="Trimmomatic" version="0.36.3">
+=======
+<tool id="trimmomatic" name="Trimmomatic" version="0.36.1">
+>>>>>>> upstream/master
+  <description>flexible read trimming tool for Illumina NGS data</description>
+  <macros>
+    <import>trimmomatic_macros.xml</import>
+  </macros>
+  <requirements>
+    <requirement type="package" version="0.36">trimmomatic</requirement>
+  </requirements>
+<<<<<<< HEAD
+  <command detect_errors="aggressive"><![CDATA[
+  #if $readtype.single_or_paired == "pair_of_files"
+    #set r1_ext = $readtype.fastq_r1_in.extension
+    #set r2_ext = $readtype.fastq_r2_in.extension
+    ln -s '$readtype.fastq_r1_in' fastq_r1.'$r1_ext' &&
+    ln -s '$readtype.fastq_r2_in' fastq_r2.'$r2_ext' &&
+  #elif $readtype.single_or_paired == "collection"
+    #set r1_ext = $readtype.fastq_pair.forward.extension
+    #set r2_ext = $readtype.fastq_pair.reverse.extension
+    ln -s '$readtype.fastq_pair.forward' fastq_r1.'$r1_ext' &&
+    ln -s '$readtype.fastq_pair.reverse' fastq_r2.'$r2_ext' &&
+  #else
+    ln -s '$fastq_in' fastq_in.'$fastq_in.extension' &&
+  #end if
+  bash '${__tool_directory__}/trimmomatic.sh'
+  #if $readtype.single_or_paired in ["pair_of_files","collection"]
+=======
+  <stdio>
+    <exit_code range="1:" />
+  </stdio>
+  <command><![CDATA[
+  @CONDA_TRIMMOMATIC_JAR_PATH@ &&
+  @CONDA_TRIMMOMATIC_ADAPTERS_PATH@ &&
+  java -mx8G -jar \$TRIMMOMATIC_JAR_PATH/trimmomatic.jar
+  #if $paired_end.is_paired_end
+>>>>>>> upstream/master
+    PE -threads \${GALAXY_SLOTS:-6} -phred33
+      fastq_r1.'$r1_ext' fastq_r2.'$r2_ext'
+      fastq_out_r1_paired.'$r1_ext' fastq_out_r1_unpaired.'$r1_ext'
+      fastq_out_r2_paired.'$r2_ext' fastq_out_r2_unpaired.'$r2_ext'
+  #else
+    SE -threads \${GALAXY_SLOTS:-6} -phred33 fastq_in.'$fastq_in.extension' fastq_out.'$fastq_in.extension'
+  #end if
+  ## ILLUMINACLIP option
+  #if $illuminaclip.do_illuminaclip
+    ILLUMINACLIP:\$TRIMMOMATIC_ADAPTERS_PATH/$illuminaclip.adapter_fasta:$illuminaclip.seed_mismatches:$illuminaclip.palindrome_clip_threshold:$illuminaclip.simple_clip_threshold
+  #end if
+  ## Other operations
+  #for $op in $operations
+    ## SLIDINGWINDOW
+    #if str( $op.operation.name ) == "SLIDINGWINDOW"
+      SLIDINGWINDOW:$op.operation.window_size:$op.operation.required_quality
+    #end if
+    ## MINLEN:36
+    #if str( $op.operation.name ) == "MINLEN"
+      MINLEN:$op.operation.minlen
+    #end if
+    #if str( $op.operation.name ) == "LEADING"
+      LEADING:$op.operation.leading
+    #end if
+    #if str( $op.operation.name ) == "TRAILING"
+      TRAILING:$op.operation.trailing
+    #end if
+    #if str( $op.operation.name ) == "CROP"
+      CROP:$op.operation.crop
+    #end if
+    #if str( $op.operation.name ) == "HEADCROP"
+      HEADCROP:$op.operation.headcrop
+    #end if
+    #if str( $op.operation.name ) == "AVGQUAL"
+      AVGQUAL:$op.operation.avgqual
+    #end if
+    #if str( $op.operation.name ) == "MAXINFO"
+      MAXINFO:$op.operation.target_length:$op.operation.strictness
+    #end if
+  #end for
+<<<<<<< HEAD
+  &&
+  #if $readtype.single_or_paired  == "pair_of_files"
+    mv fastq_out_r1_paired.'$r1_ext' '${fastq_out_r1_paired}' &&
+    mv fastq_out_r1_unpaired.'$r1_ext' '${fastq_out_r1_unpaired}' &&
+    mv fastq_out_r2_paired.'$r2_ext' '${fastq_out_r2_paired}' &&
+    mv fastq_out_r2_unpaired.'$r2_ext' '${fastq_out_r2_unpaired}'
+  #elif $readtype.single_or_paired  == "collection"
+    mv fastq_out_r1_paired.'$r1_ext' '${fastq_out_paired.forward}' &&
+    mv fastq_out_r1_unpaired.'$r1_ext' '${fastq_out_unpaired.forward}' &&
+    mv fastq_out_r2_paired.'$r2_ext' '${fastq_out_paired.reverse}' &&
+    mv fastq_out_r2_unpaired.'$r2_ext' '${fastq_out_unpaired.reverse}'
+  #else
+    mv fastq_out.'$fastq_in.extension' '${fastq_out}'
+  #end if
+=======
+  2>&1 | tee trimmomatic.log &&
+  if [ -z "\$(tail -1 trimmomatic.log | grep "Completed successfully")" ]; then echo "Trimmomatic did not finish successfully" >&2 ; exit 1 ; fi
+>>>>>>> upstream/master
+  ]]></command>
+  <inputs>
+    <conditional name="readtype">
+        <param name="single_or_paired" type="select" label="Single-end or paired-end reads?">
+           <option value="se" selected="true">Single-end</option>
+           <option value="pair_of_files">Paired-end (two separate input files)</option>
+           <option value="collection">Paired-end (as collection)</option>
+        </param>
+    <when value="se">
+      <param name="fastq_in" type="data" format="fastqsanger,fastqsanger.gz" label="Input FASTQ file" />
+    </when>
+    <when value="pair_of_files">
+      <param name="fastq_r1_in" type="data" format="fastqsanger,fastqsanger.gz"
+         label="Input FASTQ file (R1/first of pair)" />
+      <param name="fastq_r2_in" type="data" format="fastqsanger,fastqgsanger.gz"
+         label="Input FASTQ file (R2/second of pair)" />
+    </when>
+        <when value="collection">
+          <param name="fastq_pair" format="fastqsanger,fastqsanger.gz" type="data_collection" collection_type="paired" label="Select FASTQ dataset collection with R1/R2 pair" />
+        </when>
+      </conditional>
+    <conditional name="illuminaclip">
+    <param name="do_illuminaclip" type="boolean" label="Perform initial ILLUMINACLIP step?" help="Cut adapter and other illumina-specific sequences from the read" truevalue="yes" falsevalue="no" checked="False" />
+    <when value="yes">
+      <param name="adapter_fasta" type="select" label="Adapter sequences to use">
+    <option value="TruSeq2-SE.fa">TruSeq2 (single-ended, for Illumina GAII)</option>
+    <option value="TruSeq3-SE.fa">TruSeq3 (single-ended, for MiSeq and HiSeq)</option>
+    <option value="TruSeq2-PE.fa">TruSeq2 (paired-ended, for Illumina GAII)</option>
+    <option value="TruSeq3-PE.fa">TruSeq3 (paired-ended, for MiSeq and HiSeq)</option>
+    <option value="TruSeq3-PE-2.fa">TruSeq3 (additional seqs) (paired-ended, for MiSeq and HiSeq)</option>
+    <option value="NexteraPE-PE.fa">Nextera (paired-ended)</option>
+      </param>
+      <param name="seed_mismatches" type="integer" label="Maximum mismatch count which will still allow a full match to be performed" value="2" />
+      <param name="palindrome_clip_threshold" type="integer" label="How accurate the match between the two 'adapter ligated' reads must be for PE palindrome read alignment" value="30" />
+      <param name="simple_clip_threshold" type="integer" label="How accurate the match between any adapter etc. sequence must be against a read" value="10" />
+    </when>
+    <when value="no" /> <!-- empty clause to satisfy planemo lint -->
+    </conditional>
+    <repeat name="operations" title="Trimmomatic Operation" min="1">
+      <conditional name="operation">
+    <param name="name" type="select" label="Select Trimmomatic operation to perform">
+      <option selected="true" value="SLIDINGWINDOW">Sliding window trimming (SLIDINGWINDOW)</option>
+      <option value="MINLEN">Drop reads below a specified length (MINLEN)</option>
+      <option value="LEADING">Cut bases off the start of a read, if below a threshold quality (LEADING)</option>
+      <option value="TRAILING">Cut bases off the end of a read, if below a threshold quality (TRAILING)</option>
+      <option value="CROP">Cut the read to a specified length (CROP)</option>
+      <option value="HEADCROP">Cut the specified number of bases from the start of the read (HEADCROP)</option>
+      <option value="AVGQUAL">Drop reads with average quality lower than a specified level (AVGQUAL)</option>
+      <option value="MAXINFO">Trim reads adaptively, balancing read length and error rate to maximise the value of each read (MAXINFO)</option>
+    </param>
+    <when value="SLIDINGWINDOW">
+      <param name="window_size" type="integer" label="Number of bases to average across" value="4" />
+      <param name="required_quality" type="integer" label="Average quality required" value="20" />
+    </when>
+    <when value="MINLEN">
+      <param name="minlen" type="integer" label="Minimum length of reads to be kept" value="20" />
+    </when>
+    <when value="LEADING">
+      <param name="leading" type="integer" label="Minimum quality required to keep a base" value="3" help="Bases at the start of the read with quality below the threshold will be removed" />
+    </when>
+    <when value="TRAILING">
+      <param name="trailing" type="integer" label="Minimum quality required to keep a base" value="3" help="Bases at the end of the read with quality below the threshold will be removed" />
+    </when>
+    <when value="CROP">
+      <param name="crop" type="integer" label="Number of bases to keep from the start of the read" value="" />
+    </when>
+    <when value="HEADCROP">
+      <param name="headcrop" type="integer" label="Number of bases to remove from the start of the read" value="" />
+    </when>
+    <when value="AVGQUAL">
+      <param name="avgqual" type="integer" label="Minimum average quality required to keep a read" value="" />
+    </when>
+    <when value="MAXINFO">
+      <param name="target_length" type="integer" label="Target read length" value="" help="The read length which is likely to allow the location of the read within the target sequence to be determined." />
+      <param name="strictness" type="float" label="Strictness" value="" help="Set between zero and one - specifies the balance between preserving read length versus removal of incorrect bases; low values (&lt;0.2) favours longer reads, high values (&gt;0.8) favours read correctness." />
+    </when>
+      </conditional>
+    </repeat>
+  </inputs>
+  <outputs>
+    <data name="fastq_out_r1_paired" label="${tool.name} on ${readtype.fastq_r1_in.name} (R1 paired)" format_source="fastq_r1_in">
+      <filter>readtype['single_or_paired'] == "pair_of_files"</filter>
+    </data>
+    <data name="fastq_out_r2_paired" label="${tool.name} on ${readtype.fastq_r2_in.name} (R2 paired)" format_source="fastq_r2_in">
+      <filter>readtype['single_or_paired'] == "pair_of_files"</filter>
+    </data>
+    <data name="fastq_out_r1_unpaired" label="${tool.name} on ${readtype.fastq_r1_in.name} (R1 unpaired)" format_source="fastq_r1_in">
+      <filter>readtype['single_or_paired'] == "pair_of_files"</filter>
+    </data>
+    <data name="fastq_out_r2_unpaired" label="${tool.name} on ${readtype.fastq_r2_in.name} (R2 unpaired)" format_source="fastq_r2_in">
+      <filter>readtype['single_or_paired'] == "pair_of_files"</filter>
+    </data>
+    <data name="fastq_out" label="${tool.name} on ${readtype.fastq_in.name}" format_source="fastq_in">
+      <filter>readtype['single_or_paired'] == 'se'</filter>
+    </data>
+    <collection name="fastq_out_paired" type="paired" label="${tool.name} on ${readtype.fastq_pair.name}: paired">
+      <filter>readtype['single_or_paired'] == "collection"</filter>
+      <data name="forward" label="${tool.name} on ${readtype.fastq_pair.forward.name} (R1 paired)" format_source="fastq_pair['forward']"/>
+      <data name="reverse" label="${tool.name} on ${readtype.fastq_pair.reverse.name} (R2 paired)" format_source="fastq_pair['reverse']"/>
+    </collection>
+      <collection name="fastq_out_unpaired" type="paired" label="${tool.name} on ${readtype.fastq_pair.name}: unpaired">
+        <filter>readtype['single_or_paired'] == "collection"</filter>
+        <data name="forward" label="${tool.name} on ${readtype.fastq_pair.forward.name} (R1 unpaired)" format_source="fastq_pair['forward']"/>
+        <data name="reverse" label="${tool.name} on ${readtype.fastq_pair.reverse.name} (R2 unpaired)" format_source="fastq_pair['reverse']"/>
+    </collection>
+
+  </outputs>
+  <tests>
+    <test>
+      <!-- Single-end example -->
+      <param name="single_or_paired" value="se" />
+      <param name="fastq_in" value="Illumina_SG_R1.fastq" ftype="fastqsanger" />
+      <param name="operations_0|operation|name" value="SLIDINGWINDOW" />
+      <!--
+      **NB** outputs have to be specified in order that they appear in the
+      tool (which is the order they will be written to the history) - the
+      test framework seems to use the order and ignores the "name" attribute
+      -->
+      <output name="fastq_out" file="trimmomatic_se_out1.fastq" />
+    </test>
+    <test>
+      <!-- Single-end example - gzipped -->
+      <param name="single_or_paired" value="se" />
+      <param name="fastq_in" value="Illumina_SG_R1.fastq.gz" ftype="fastqsanger.gz" />
+      <param name="operations_0|operation|name" value="SLIDINGWINDOW" />
+      <!--
+      **NB** outputs have to be specified in order that they appear in the
+      tool (which is the order they will be written to the history) - the
+      test framework seems to use the order and ignores the "name" attribute
+      -->
+      <output name="fastq_out" file="trimmomatic_se_out1.fastq.gz" />
+    </test>
+    <test>
+      <!-- Paired-end example - gzipped -->
+      <param name="single_or_paired" value="pair_of_files" />
+      <param name="fastq_r1_in" value="Illumina_SG_R1.fastq.gz" ftype="fastqsanger.gz" />
+      <param name="fastq_r2_in" value="Illumina_SG_R2.fastq.gz" ftype="fastqsanger.gz" />
+      <param name="operations_0|operation|name" value="SLIDINGWINDOW" />
+      <!--
+      **NB** outputs have to be specified in order that they appear in the
+      tool (which is the order they will be written to the history) - the
+      test framework seems to use the order and ignores the "name" attribute
+      -->
+      <output name="fastq_out_r1_paired" file="trimmomatic_pe_r1_paired_out1.fastq.gz" />
+      <output name="fastq_out_r1_unpaired" file="trimmomatic_pe_r1_unpaired_out1.fastq.gz" />
+      <output name="fastq_out_r2_paired" file="trimmomatic_pe_r2_paired_out1.fastq.gz" />
+      <output name="fastq_out_r2_unpaired" file="trimmomatic_pe_r2_unpaired_out1.fastq.gz" />
+    </test>
+    <test>
+      <!-- Paired-end example -->
+      <param name="single_or_paired" value="pair_of_files" />
+      <param name="fastq_r1_in" value="Illumina_SG_R1.fastq" ftype="fastqsanger" />
+      <param name="fastq_r2_in" value="Illumina_SG_R2.fastq" ftype="fastqsanger" />
+      <param name="operations_0|operation|name" value="SLIDINGWINDOW" />
+      <!--
+      **NB** outputs have to be specified in order that they appear in the
+      tool (which is the order they will be written to the history) - the
+      test framework seems to use the order and ignores the "name" attribute
+      -->
+      <output name="fastq_out_r1_paired" file="trimmomatic_pe_r1_paired_out1.fastq" />
+      <output name="fastq_out_r1_unpaired" file="trimmomatic_pe_r1_unpaired_out1.fastq" />
+      <output name="fastq_out_r2_paired" file="trimmomatic_pe_r2_paired_out1.fastq" />
+      <output name="fastq_out_r2_unpaired" file="trimmomatic_pe_r2_unpaired_out1.fastq" />
+    </test>
+    <test>
+      <!-- Single-end example (cropping) -->
+      <param name="single_or_paired" value="se" />
+      <param name="fastq_in" value="Illumina_SG_R1.fastq" ftype="fastqsanger" />
+      <param name="operations_0|operation|name" value="CROP" />
+      <param name="operations_0|operation|crop" value="10" />
+      <!--
+      **NB** outputs have to be specified in order that they appear in the
+      tool (which is the order they will be written to the history) - the
+      test framework seems to use the order and ignores the "name" attribute
+      -->
+      <output name="fastq_out" file="trimmomatic_se_out2.fastq" />
+    </test>
+    <test>
+      <!-- Paired-end with dataset collection -->
+      <param name="single_or_paired" value="collection" />
+      <param name="fastq_pair">
+        <collection type="paired">
+          <element name="forward" value="Illumina_SG_R1.fastq" ftype="fastqsanger" />
+          <element name="reverse" value="Illumina_SG_R2.fastq" ftype="fastqsanger"/>
+        </collection>
+      </param>
+      <param name="operations_0|operation|name" value="SLIDINGWINDOW" />
+      <output_collection name="fastq_out_paired" type="paired">
+    <element name="forward" file="trimmomatic_pe_r1_paired_out1.fastq" />
+    <element name="reverse" file="trimmomatic_pe_r2_paired_out1.fastq" />
+      </output_collection>
+      <output_collection name="fastq_out_unpaired" type="paired">
+    <element name="forward" file="trimmomatic_pe_r1_unpaired_out1.fastq" />
+    <element name="reverse" file="trimmomatic_pe_r2_unpaired_out1.fastq" />
+      </output_collection>
+    </test>
+    <test>
+      <!-- Paired-end with dataset collection - gzipped -->
+      <param name="single_or_paired" value="collection" />
+      <param name="fastq_pair">
+        <collection type="paired">
+          <element name="forward" value="Illumina_SG_R1.fastq.gz" ftype="fastqsanger.gz" />
+          <element name="reverse" value="Illumina_SG_R2.fastq.gz" ftype="fastqsanger.gz"/>
+        </collection>
+      </param>
+      <param name="operations_0|operation|name" value="SLIDINGWINDOW" />
+      <output_collection name="fastq_out_paired" type="paired">
+    <element name="forward" file="trimmomatic_pe_r1_paired_out1.fastq.gz" />
+    <element name="reverse" file="trimmomatic_pe_r2_paired_out1.fastq.gz" />
+      </output_collection>
+      <output_collection name="fastq_out_unpaired" type="paired">
+    <element name="forward" file="trimmomatic_pe_r1_unpaired_out1.fastq.gz" />
+    <element name="reverse" file="trimmomatic_pe_r2_unpaired_out1.fastq.gz" />
+      </output_collection>
+    </test>
+    <test>
+      <!-- Single-end using AVGQUAL -->
+      <param name="single_or_paired" value="se" />
+      <param name="fastq_in" value="Illumina_SG_R1.fastq" ftype="fastqsanger" />
+      <param name="operations_0|operation|name" value="AVGQUAL" />
+      <param name="operations_0|operation|avgqual" value="30" />
+      <output name="fastq_out" file="trimmomatic_avgqual.fastq" />
+    </test>
+    <test>
+      <!-- Single-end using MAXINFO -->
+      <param name="single_or_paired" value="se" />
+      <param name="fastq_in" value="Illumina_SG_R1.fastq" ftype="fastqsanger" />
+      <param name="operations_0|operation|name" value="MAXINFO" />
+      <param name="operations_0|operation|target_length" value="75" />
+      <param name="operations_0|operation|strictness" value="0.8" />
+      <output name="fastq_out" file="trimmomatic_maxinfo.fastq" />
+    </test>
+  </tests>
+  <help><![CDATA[
+.. class:: infomark
+
+**What it does**
+
+Trimmomatic performs a variety of useful trimming tasks for illumina paired-end and
+single ended data.
+
+This tool allows the following trimming steps to be performed:
+
+ * **ILLUMINACLIP:** Cut adapter and other illumina-specific sequences from the read
+ * **SLIDINGWINDOW:** Perform a sliding window trimming, cutting once the average
+   quality within the window falls below a threshold
+ * **MINLEN:** Drop the read if it is below a specified length
+ * **LEADING:** Cut bases off the start of a read, if below a threshold quality
+ * **TRAILING:** Cut bases off the end of a read, if below a threshold quality
+ * **CROP:** Cut the read to a specified length
+ * **HEADCROP:** Cut the specified number of bases from the start of the read
+ * **AVGQUAL:** Drop the read if the average quality is below a specified value
+ * **MAXINFO:** Trim reads adaptively, balancing read length and error rate to
+   maximise the value of each read
+
+If ILLUMINACLIP is requested then it is always performed first; subsequent options
+can be mixed and matched and will be performed in the order that they have been
+specified.
+
+.. class:: warningmark
+
+Note that trimming operation order is important.
+
+-------------
+
+.. class:: infomark
+
+**Inputs**
+
+For single-end data this Trimmomatic tool accepts a single FASTQ file; for
+paired-end data it will accept either two FASTQ files (R1 and R2), or a
+dataset collection containing the R1/R2 FASTQ pair.
+
+.. class:: infomark
+
+**Outputs**
+
+For paired-end data a particular strength of Trimmomatic is that it retains the
+pairing of reads (from R1 and R2) in the filtered output files:
+
+ * Two FASTQ files (R1-paired and R2-paired) contain one read from each pair where
+   both have survived filtering.
+ * Additionally two FASTQ files (R1-unpaired and R2-unpaired) contain reads where
+   one of the pair failed the filtering steps.
+
+.. class:: warningmark
+
+If the input consists of a dataset collection with the R1/R2 FASTQ pair then
+the outputs will also inclue two dataset collections: one for the 'paired'
+outputs and one for the 'unpaired' (as described above)
+
+Retaining the same order and number of reads in the filtered output fastq files is
+essential for many downstream analysis tools.
+
+For single-end data the output is a single FASTQ file containing just the filtered
+reads.
+
+-------------
+
+.. class:: infomark
+
+**Credits**
+
+This Galaxy tool has been developed within the Bioinformatics Core Facility at the
+University of Manchester. It runs the Trimmomatic program which has been developed
+within Bjorn Usadel's group at RWTH Aachen university.
+
+Trimmomatic website (including documentation):
+
+ * http://www.usadellab.org/cms/index.php?page=trimmomatic
+
+The reference for Trimmomatic is:
+
+ * Bolger, A.M., Lohse, M., &amp; Usadel, B. (2014). Trimmomatic: A flexible trimmer
+   for Illumina Sequence Data. Bioinformatics, btu170.
+
+Please kindly acknowledge both this Galaxy tool and the Trimmomatic program if you
+use it.
+  ]]></help>
+  <citations>
+    <!--
+    See https://wiki.galaxyproject.org/Admin/Tools/ToolConfigSyntax#A.3Ccitations.3E_tag_set
+    Can be either DOI or Bibtex
+    Use http://www.bioinformatics.org/texmed/ to convert PubMed to Bibtex
+    -->
+    <citation type="doi">10.1093/bioinformatics/btu170</citation>
+  </citations>
+</tool>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trimmomatic_BACKUP_16831.sh	Mon Jan 23 07:46:47 2017 -0500
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Shell wrapper to run Trimmomatic jar file as a Galaxy tool
+echo Arguments:
+for i in $@ ; do
+    echo "*" $i
+done
+
+if [ -n "$CONDA_PREFIX" ] ; then
+  # bioconda installs trimmomatic in a share directory
+  # with a jarfile called trimmomatic.jar
+  TRIMMOMATIC_DIR="$CONDA_PREFIX/share/trimmomatic"
+  JARFILE="trimmomatic.jar"
+else
+  JARFILE="trimmomatic-0.36.jar"
+fi
+
+if [ -z "$TRIMMOMATIC_DIR" ] ; then
+  echo "TRIMMOMATIC_DIR variable not set, can't find jar file"
+  exit 1
+fi
+
+java -mx16G -jar $TRIMMOMATIC_DIR/$JARFILE $@ 2>&1 | tee trimmomatic.log
+status=$?
+echo "Exit status: $status"
+# Check for successful completion
+if [ -z "$(tail -1 trimmomatic.log | grep "Completed successfully")" ] ; then
+    echo "Trimmomatic did not finish successfully" >&2
+    exit 1
+fi
+exit $status
+##
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trimmomatic_BACKUP_16925.sh	Mon Jan 23 07:46:47 2017 -0500
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Shell wrapper to run Trimmomatic jar file as a Galaxy tool
+echo Arguments:
+for i in $@ ; do
+    echo "*" $i
+done
+
+if [ -n "$CONDA_PREFIX" ] ; then
+  # bioconda installs trimmomatic in a share directory
+  # with a jarfile called trimmomatic.jar
+  TRIMMOMATIC_DIR="$CONDA_PREFIX/share/trimmomatic"
+  JARFILE="trimmomatic.jar"
+else
+  JARFILE="trimmomatic-0.36.jar"
+fi
+
+if [ -z "$TRIMMOMATIC_DIR" ] ; then
+  echo "TRIMMOMATIC_DIR variable not set, can't find jar file"
+  exit 1
+fi
+
+java -mx16G -jar $TRIMMOMATIC_DIR/$JARFILE $@ 2>&1 | tee trimmomatic.log
+status=$?
+echo "Exit status: $status"
+# Check for successful completion
+if [ -z "$(tail -1 trimmomatic.log | grep "Completed successfully")" ] ; then
+    echo "Trimmomatic did not finish successfully" >&2
+    exit 1
+fi
+exit $status
+##
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trimmomatic_BASE_16831.sh	Mon Jan 23 07:46:47 2017 -0500
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Shell wrapper to run Trimmomatic jar file as a Galaxy tool
+echo Arguments:
+for i in $@ ; do
+    echo "*" $i
+done
+java $@ 2>&1 | tee trimmomatic.log
+status=$?
+echo "Exit status: $status"
+# Check for successful completion
+if [ -z "$(tail -1 trimmomatic.log | grep "Completed successfully")" ] ; then
+    echo "Trimmomatic did not finish successfully" >&2
+    exit 1
+fi
+exit $status
+##
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trimmomatic_BASE_16925.sh	Mon Jan 23 07:46:47 2017 -0500
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Shell wrapper to run Trimmomatic jar file as a Galaxy tool
+echo Arguments:
+for i in $@ ; do
+    echo "*" $i
+done
+java $@ 2>&1 | tee trimmomatic.log
+status=$?
+echo "Exit status: $status"
+# Check for successful completion
+if [ -z "$(tail -1 trimmomatic.log | grep "Completed successfully")" ] ; then
+    echo "Trimmomatic did not finish successfully" >&2
+    exit 1
+fi
+exit $status
+##
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trimmomatic_LOCAL_16831.sh	Mon Jan 23 07:46:47 2017 -0500
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Shell wrapper to run Trimmomatic jar file as a Galaxy tool
+echo Arguments:
+for i in $@ ; do
+    echo "*" $i
+done
+
+if [ -n "$CONDA_PREFIX" ] ; then
+  # bioconda installs trimmomatic in a share directory
+  # with a jarfile called trimmomatic.jar
+  TRIMMOMATIC_DIR="$CONDA_PREFIX/share/trimmomatic"
+  JARFILE="trimmomatic.jar"
+else
+  JARFILE="trimmomatic-0.36.jar"
+fi
+
+if [ -z "$TRIMMOMATIC_DIR" ] ; then
+  echo "TRIMMOMATIC_DIR variable not set, can't find jar file"
+  exit 1
+fi
+
+java -mx16G -jar $TRIMMOMATIC_DIR/$JARFILE $@ 2>&1 | tee trimmomatic.log
+status=$?
+echo "Exit status: $status"
+# Check for successful completion
+if [ -z "$(tail -1 trimmomatic.log | grep "Completed successfully")" ] ; then
+    echo "Trimmomatic did not finish successfully" >&2
+    exit 1
+fi
+exit $status
+##
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trimmomatic_LOCAL_16925.sh	Mon Jan 23 07:46:47 2017 -0500
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Shell wrapper to run Trimmomatic jar file as a Galaxy tool
+echo Arguments:
+for i in $@ ; do
+    echo "*" $i
+done
+
+if [ -n "$CONDA_PREFIX" ] ; then
+  # bioconda installs trimmomatic in a share directory
+  # with a jarfile called trimmomatic.jar
+  TRIMMOMATIC_DIR="$CONDA_PREFIX/share/trimmomatic"
+  JARFILE="trimmomatic.jar"
+else
+  JARFILE="trimmomatic-0.36.jar"
+fi
+
+if [ -z "$TRIMMOMATIC_DIR" ] ; then
+  echo "TRIMMOMATIC_DIR variable not set, can't find jar file"
+  exit 1
+fi
+
+java -mx16G -jar $TRIMMOMATIC_DIR/$JARFILE $@ 2>&1 | tee trimmomatic.log
+status=$?
+echo "Exit status: $status"
+# Check for successful completion
+if [ -z "$(tail -1 trimmomatic.log | grep "Completed successfully")" ] ; then
+    echo "Trimmomatic did not finish successfully" >&2
+    exit 1
+fi
+exit $status
+##
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trimmomatic_macros.xml	Mon Jan 23 07:46:47 2017 -0500
@@ -0,0 +1,8 @@
+<macros>
+  <!-- 
+       Set the path for the trimmomatic JAR and data files
+       Based on https://github.com/galaxyproject/tools-iuc/blob/master/tool_collections/snpsift/snpSift_macros.xml#L13
+  -->
+  <token name="@CONDA_TRIMMOMATIC_JAR_PATH@">if [ -z "\$TRIMMOMATIC_JAR_PATH" ]; then export TRIMMOMATIC_JAR_PATH=\$(dirname \$(readlink -e \$(which trimmomatic))); fi</token>
+  <token name="@CONDA_TRIMMOMATIC_ADAPTERS_PATH@">if [ -z "\$TRIMMOMATIC_ADAPTERS_PATH" ]; then export TRIMMOMATIC_ADAPTERS_PATH=\$(dirname \$(readlink -e \$(which trimmomatic)))/adapters; fi</token>
+</macros>