Mercurial > repos > rnateam > sortmerna

changeset 6:97f73e0566c9 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/rna_tools/sortmerna commit 9fcf62e1e259381613e48a0ff28c27bd4fe82707
author rnateam
date Tue, 29 Mar 2016 06:53:28 -0400
parents 233da82dc31c
children bf2866308fbd
files sortmerna.xml tool_dependencies.xml
diffstat 2 files changed, 43 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/sortmerna.xml	Wed Dec 09 09:21:28 2015 -0500
+++ b/sortmerna.xml	Tue Mar 29 06:53:28 2016 -0400
@@ -1,7 +1,7 @@
-<tool id="bg_sortmerna" name="Filter with SortMeRNA" version="2.1.0">
+<tool id="bg_sortmerna" name="Filter with SortMeRNA" version="2.1b.0">
     <description>Fast and accurate filtering of ribosomal RNAs in metatranscriptomic data</description>
     <requirements>
-        <requirement type='package' version="2.0">sortmerna</requirement>
+        <requirement type="package" version="2.1b">sortmerna</requirement>
     </requirements>
     <stdio>
         <regex match="This program builds a Burst trie on an input rRNA database"
@@ -12,6 +12,10 @@
             source="both"
             level="fatal"
             description="The database ${databases} has not been preprocessed using buildtrie before using SortMeRNA." />
+        <regex match="ERROR"
+            source="both"
+            level="fatal"
+            description="ERROR" />
     </stdio>
     <version_command>
 <![CDATA[
@@ -76,9 +80,7 @@
     	$log
 
         #if $report.report_type == 'best'
-            #if $report.report_best.report_best_type == '0'
-                --best 0
-            #else if $report.report_best.report_best_type == '1'
+            #if $report.report_best.report_best_type == '1'
                 --best 1
                 --min_lis $report.report_best.report_best_min_lis
             #else
@@ -195,11 +197,9 @@
             <when value="best">
                 <conditional name="report_best">
                     <param name="report_best_type" type="select" label="Number of searched alignments" help="Only the best alignment is reported (--best)">
-                        <option value="0">All high-candidate reference sequences are searched for alignments (very slow)</option>
                         <option value="1" selected="true">Only one high-candidate reference sequence is searched for alignments (fast). The high-candidate sequences are determined heuristically using a LIS of seed matches)</option>
                         <option value="other_value">A custom number of reference sequences are searched for alignments (speed decrease for high value)</option>
                     </param>
-                    <when value="0" />
                     <when value="1">
                         <param name="report_best_min_lis" type="integer" min="0" max="100" value="2" label="Number of longest LIS an alignement needs to be searched" help="The alignements having the first INT longest LIS. LIS stands for Longest Increasing Subsequence, it is computed using seeds' positions to expand hits into longer matches prior to Smith-Waterman alignment. (--min_lis)"/>
                     </when>
--- a/tool_dependencies.xml	Wed Dec 09 09:21:28 2015 -0500
+++ b/tool_dependencies.xml	Tue Mar 29 06:53:28 2016 -0400
@@ -1,46 +1,48 @@
 <?xml version="1.0"?>
 <tool_dependency>
-    <package name="sortmerna" version="2.0">
+    <package name="sortmerna" version="2.1b">
         <install version="1.0">
             <actions_group>
                 <actions architecture="x86_64" os="linux">
-                        <action type="download_by_url" target_filename="sortmerna-2.0.tar.gz">https://github.com/biocore/sortmerna/archive/2.0.tar.gz</action>
-                        <action type="autoconf"/>
-                        <action type="change_directory">../</action>
-                        <action type="make_directory">$INSTALL_DIR/rRNA_databases/</action>
-                        <action type="move_directory_files">
-                            <source_directory>sortmerna-2.0/rRNA_databases/</source_directory>
-                            <destination_directory>$INSTALL_DIR/rRNA_databases/</destination_directory>
-                        </action>
-                        <action type="set_environment">
-                            <environment_variable name="SORTMERNADIR" action="set_to">$INSTALL_DIR/</environment_variable>
-                            <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
-                        </action>
-                    </actions>
+                    <action type="download_by_url" target_filename="sortmerna-2.1b.tar.gz">https://github.com/biocore/sortmerna/archive/2.1b.tar.gz</action>
+                    <action type="shell_command"><![CDATA[
+                        ./build.sh --prefix=$INSTALL_DIR
+                    ]]>
+                    </action>
+                    <action type="shell_command">make install</action>
+                    <action type="make_directory">$INSTALL_DIR/rRNA_databases/</action>
+                    <action type="move_directory_files">
+                        <source_directory>rRNA_databases/</source_directory>
+                        <destination_directory>$INSTALL_DIR/rRNA_databases/</destination_directory>
+                    </action>
+                    <action type="set_environment">
+                        <environment_variable name="SORTMERNADIR" action="set_to">$INSTALL_DIR/</environment_variable>
+                        <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
+                    </action>
+                </actions>
                 <actions architecture="x86_64" os="darwin">
-                        <action type="download_by_url" target_filename="sortmerna-2.0.tar.gz">https://github.com/biocore/sortmerna/archive/2.0.tar.gz</action>
-                        <action type="shell_command"><![CDATA[
-                            export CC=gcc-mp-4.8 && export CXX=g++-mp-4.8 && ./configure && make && make install
-                        ]]>
-                        </action>
-                        <action type="change_directory">../</action>
-                        <action type="make_directory">$INSTALL_DIR/rRNA_databases/</action>
-                        <action type="move_directory_files">
-                            <source_directory>sortmerna-2.0/rRNA_databases/</source_directory>
-                            <destination_directory>$INSTALL_DIR/rRNA_databases/</destination_directory>
-                        </action>
-                        <action type="set_environment">
-                            <environment_variable name="SORTMERNADIR" action="set_to">$INSTALL_DIR/</environment_variable>
-                            <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
-                        </action>                
-                    </actions>
-                </actions_group>
+                    <action type="download_by_url" target_filename="sortmerna-2.1b.tar.gz">https://github.com/biocore/sortmerna/archive/2.1b.tar.gz</action>
+                    <action type="shell_command"><![CDATA[
+                        export CC=gcc-mp-4.8 && export CXX=g++-mp-4.8 && ./build.sh --prefix=$INSTALL_DIR && make install
+                    ]]>
+                    </action>
+                    <action type="make_directory">$INSTALL_DIR/rRNA_databases/</action>
+                    <action type="move_directory_files">
+                        <source_directory>rRNA_databases/</source_directory>
+                        <destination_directory>$INSTALL_DIR/rRNA_databases/</destination_directory>
+                    </action>
+                    <action type="set_environment">
+                        <environment_variable name="SORTMERNADIR" action="set_to">$INSTALL_DIR/</environment_variable>
+                        <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
+                    </action>
+                </actions>
+            </actions_group>
         </install>
         <readme>
-        SortMeRNA requires g++ 4.8 or later. 
+        SortMeRNA requires g++ 4.8 or later.
 
-        Note: the Clang compiler on Mac (distributed through Xcode) does not 
-        support multithreading. The user is recommended to install the original 
+        Note: the Clang compiler on Mac (distributed through Xcode) does not
+        support multithreading. The user is recommended to install the original
         GCC compiler via MacPorts
         </readme>
     </package>