Merge branch 'hotfix/2.5.7'

deeptools · Feb 5, 2018 · 4abb1e7 · 4abb1e7
2 parents db4400d + 1073a99
commit 4abb1e7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.5.7
+
+ * Fixed a small bug that caused computation to stop. This was related to a change made for release 2.5.5.
+
 2.5.6
 
  * Fixed a bug where deepTools in python3 can't handle npz file labels created under python 2.

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.6'
+__version__ = '2.5.7'
diff --git a/deeptools/utilities.py b/deeptools/utilities.py
@@ -399,7 +399,7 @@ def bam_blacklisted_reads(bam_handle, chroms_to_ignore, blackListFileName=None,
     if hasOverlaps:
         sys.exit("Your blacklist file(s) has (have) regions that overlap. Proceeding with such a file would result in deepTools incorrectly calculating scaling factors. As such, you MUST fix this issue before being able to proceed.\n")
     if minOverlap < 1000:
-        sys.write("WARNING: The minimum distance between intervals in your blacklist is {}. It makes little biological sense to include small regions between two blacklisted regions. Instead, these should likely be blacklisted as well.\n".format(minOverlap))
+        sys.stderr.write("WARNING: The minimum distance between intervals in your blacklist is {}. It makes little biological sense to include small regions between two blacklisted regions. Instead, these should likely be blacklisted as well.\n".format(minOverlap))
 
     regions = []
     for chrom in bl.chroms:

diff --git a/galaxy/wrapper/deepTools_macros.xml b/galaxy/wrapper/deepTools_macros.xml
@@ -1,10 +1,10 @@
 <macros>
 
     <token name="@THREADS@">--numberOfProcessors "\${GALAXY_SLOTS:-4}"</token>
-    <token name="@WRAPPER_VERSION@">2.5.6</token>
+    <token name="@WRAPPER_VERSION@">2.5.7</token>
     <xml name="requirements">
         <requirements>
-            <requirement type="package" version="2.5.6">deeptools</requirement>
+            <requirement type="package" version="2.5.7">deeptools</requirement>
             <yield />
         </requirements>
         <expand macro="stdio" />