changeset 34:3952ec621ea9 draft

Uploaded v0.0.22c, fixed a few remaining references to BLAST+ 2.2.27 (e.g. the dependency file)
author peterjc
date Thu, 28 Nov 2013 08:56:39 -0500
parents 5402f9b0d508
children 1b8a92016045
files tools/ncbi_blast_plus/ncbi_dustmasker_wrapper.xml tools/ncbi_blast_plus/tool_dependencies.xml
diffstat 2 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/tools/ncbi_blast_plus/ncbi_dustmasker_wrapper.xml	Thu Nov 28 08:50:15 2013 -0500
+++ b/tools/ncbi_blast_plus/ncbi_dustmasker_wrapper.xml	Thu Nov 28 08:56:39 2013 -0500
@@ -1,14 +1,11 @@
 <tool id="ncbi_dustmasker_wrapper" name="NCBI dustmasker" version="0.0.22">
     <!-- dustmasker wrapper from Edward Kirton and Nicola Soranzo -->
     <description>masks low complexity regions</description>
-    <requirements>
-        <requirement type="binary">dustmasker</requirement>
-        <requirement type="package" version="2.2.27">blast+</requirement>
-    </requirements>
-    <version_command>dustmasker -version-full</version_command>
     <macros>
+        <token name="@BINARY@">dustmasker</token>
         <import>ncbi_macros.xml</import>
     </macros>
+    <expand macro="requirements" />
     <command>
 ## The command is a Cheetah template which allows some Python based syntax.
 ## Lines starting hash hash are comments. Galaxy will turn newlines into spaces
--- a/tools/ncbi_blast_plus/tool_dependencies.xml	Thu Nov 28 08:50:15 2013 -0500
+++ b/tools/ncbi_blast_plus/tool_dependencies.xml	Thu Nov 28 08:56:39 2013 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <tool_dependency>
-    <package name="blast+" version="2.2.27">
-        <repository changeset_revision="eab09bc4d63e" name="package_blast_plus_2_2_27" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+    <package name="blast+" version="2.2.28">
+        <repository changeset_revision="5a449da71d08" name="package_blast_plus_2_2_28" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
 </tool_dependency>