Merge pull request #45 from yhoogstrate/3_0_7

v3.0.7
yhoogstrate · Aug 11, 2021 · 46d7d9d · 46d7d9d
2 parents dac3af2 + 73b01bd
commit 46d7d9d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,7 @@
+2021-08-11  Redmar van den Berg
+
+	* Version 3.0.7: HOTFIX for issue #43 - Thanks @Redmar-van-den-Berg
+
 2020-05-06  Youri Hoogstrate
 
 	* Version 3.0.6: Support for ARRIBA - thanks to Alexandre Rouette

diff --git a/fuma/ComparisonTriangle.py b/fuma/ComparisonTriangle.py
@@ -147,7 +147,10 @@ def prune_duplicates(self,merged_fusions):
 
 	def log_progress(self,n_total, passed, previous_percentage):
 		# Print percentage - doesn't entirely fit yet
-		percentage = 100.0 * (float(passed) / float(n_total))
+		try:
+			percentage = 100.0 * (float(passed) / float(n_total))
+		except ZeroDivisionError:
+			percentage = 100.0
 		if percentage >= previous_percentage + 5.0 or passed == n_total:# Repport each 5%
 			self.logger.debug(str(round(percentage,1))+"% completed")
 			previous_percentage = percentage

diff --git a/fuma/__init__.py b/fuma/__init__.py
@@ -21,7 +21,7 @@
  <http://epydoc.sourceforge.net/manual-fields.html#fields-synonyms>
 """
 
-__version_info__ = ('3', '0', '6')
+__version_info__ = ('3', '0', '7')
 __version__ = '.'.join(__version_info__) if (len(__version_info__) == 3) else '.'.join(__version_info__[0:3])+"-"+__version_info__[3]
 __author__ = 'Youri Hoogstrate'
 __author_email__ = '_@.'

diff --git a/setup.py b/setup.py
@@ -39,7 +39,7 @@
 		test_suite="tests",
 		platforms=['any'],
 		setup_requires=['numpy'],
-		install_requires=['numpy','HTSeq >= 0.6.1','nose'],
+		install_requires=['numpy','HTSeq == 0.6.1','nose'],
 		classifiers=[
 			'Environment :: Console',
 			'Intended Audience :: Science/Research',