Merge branch 'release/2.5.0.1'

deeptools · Apr 2, 2017 · 28cc0ac · 28cc0ac
2 parents bb93714 + 6693688
commit 28cc0ac
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/deeptools/_version.py b/deeptools/_version.py
@@ -2,4 +2,4 @@
 # This file is originally generated from Git information by running 'setup.py
 # version'. Distribution tarballs contain a pre-generated copy of this file.
 
-__version__ = '2.5.0'
+__version__ = '2.5.0.1'
diff --git a/galaxy/wrapper/deepTools_macros.xml b/galaxy/wrapper/deepTools_macros.xml
@@ -109,6 +109,18 @@
         </param>
     </xml>
 
+    <token name="@THREADS@">--numberOfProcessors "\${GALAXY_SLOTS:-4}"</token>
+    <token name="@WRAPPER_VERSION@">2.5.0.1</token>
+    <xml name="requirements">
+        <requirements>
+            <requirement type="package" version="2.7.10">python</requirement>
+            <requirement type="package" version="2.5.0.1">deeptools</requirement>
+            <yield />
+        </requirements>
+        <expand macro="stdio" />
+        <version_command>@BINARY@ --version</version_command>
+    </xml>
+
     <xml name="smoothLength">
         <param argument="--smoothLength" type="integer" value="" optional="True" min="1"
             label="Smooth values using the following length (in bases)"

diff --git a/galaxy/wrapper/tool_dependencies.xml b/galaxy/wrapper/tool_dependencies.xml
@@ -3,7 +3,7 @@
     <package name="python" version="2.7.10">
         <repository name="package_python_2_7_10" owner="iuc" prior_installation_required="True" />
     </package>
-    <package name="deeptools" version="2.5.0">
-        <repository name="package_python_2_7_deeptools_2_5_0" owner="iuc"/>
+    <package name="deeptools" version="2.5.0.1">
+        <repository name="package_python_2_7_deeptools_2_5_0_1" owner="iuc"/>
     </package>
 </tool_dependency>
diff --git a/setup.py b/setup.py
@@ -146,10 +146,7 @@ def openREADME():
     long_description=openREADME(),
     classifiers=[
         'Intended Audience :: Science/Research',
-        'Topic :: Scientific/Engineering :: Bioinformatics',
-        'Topic :: Scientific/Engineering :: Genomics',
-        'Topic :: Scientific/Engineering :: ChIP-seq',
-        'Topic :: Scientific/Engineering :: RNA-seq'],
+        'Topic :: Scientific/Engineering :: Bio-Informatics'],
     install_requires=[
         "numpy >= 1.9.0",
         "scipy >= 0.17.0",