From 31b1480cb6dcfa8fd02c1fe8abf315943feea3e7 Mon Sep 17 00:00:00 2001 From: Redmar Date: Thu, 11 Jun 2020 14:57:19 +0200 Subject: [PATCH 1/3] Fix ZeroDivisionError When there are no fusion events at all, FuMa crashes because the progress is calculated relative to the total number of fusion events. This fixes issue #43 --- fuma/ComparisonTriangle.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fuma/ComparisonTriangle.py b/fuma/ComparisonTriangle.py index c491234..0b2c8a1 100644 --- 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 From 2fd1e8b804b8ef84348aa3b7bf5a1af0114092bf Mon Sep 17 00:00:00 2001 From: Redmar Date: Thu, 11 Jun 2020 15:42:34 +0200 Subject: [PATCH 2/3] Convert indentation to tabs instead of spaces --- fuma/ComparisonTriangle.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fuma/ComparisonTriangle.py b/fuma/ComparisonTriangle.py index 0b2c8a1..bafb173 100644 --- a/fuma/ComparisonTriangle.py +++ b/fuma/ComparisonTriangle.py @@ -147,10 +147,10 @@ def prune_duplicates(self,merged_fusions): def log_progress(self,n_total, passed, previous_percentage): # Print percentage - doesn't entirely fit yet - try: - percentage = 100.0 * (float(passed) / float(n_total)) - except ZeroDivisionError: - percentage = 100.0 + 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 From 73b01bd989c199f076ac1d7c34457cc59cdd9c55 Mon Sep 17 00:00:00 2001 From: yhoogstrate Date: Wed, 11 Aug 2021 11:36:46 +0200 Subject: [PATCH 3/3] v3.0.7 release --- Changelog | 4 ++++ fuma/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index b7464a6..2529f48 100644 --- 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/__init__.py b/fuma/__init__.py index 380ff7f..c827a12 100644 --- a/fuma/__init__.py +++ b/fuma/__init__.py @@ -21,7 +21,7 @@ """ -__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 index e3d93d6..ab90ac6 100755 --- 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',