2.5.2

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project (attempts to) adhere to [Semantic Versioning](http://semver.org/).
 
+## [2.5.2] - 2020-02-26
+### Fixed
+- The bug I tried to fix in 2.5.1 is able to fix itself
+
 ## [2.5.1] - 2020-02-24
 ### Fixed
 - Instead of crashing out, FastANI will report the error and keep going if parsing fails

drep/VERSION

@@ -1 +1 @@
-2.5.1
+2.5.2

drep/d_cluster.py

@@ -199,13 +199,23 @@ def cluster_genomes(genome_list, data_folder, **kwargs):
         for bdb, name in iteratre_clusters(Bdb,Cdb):
             logging.debug('running cluster {0}'.format(name))
             #logging.debug('total memory - {0:.2f} Mbp'.format(int(process.memory_info().rss)/1000000))
-            ndb = compare_genomes(bdb, algorithm, data_folder, **kwargs)
-
-            if len(ndb) > 0:
+            try:
+                ndb = compare_genomes(bdb, algorithm, data_folder, **kwargs)
                 ndb['primary_cluster'] = name
                 Ndb = Ndb.append(ndb)
-            else:
-                logging.error("CRITICAL ERROR WITH PRIMARY CLUSTER {0}; SKIPPING".foramt(name))
+
+            except:
+                logging.error("CRITICAL ERROR WITH PRIMARY CLUSTER {0}; TRYING AGAIN".format(name))
+
+                try:
+                    ndb = compare_genomes(bdb, algorithm, data_folder, **kwargs)
+                    if len(ndb) > 0:
+                        ndb['primary_cluster'] = name
+                        Ndb = Ndb.append(ndb)
+                    else:
+                        logging.error("CRITICAL ERROR AGAIN WITH PRIMARY CLUSTER {0}; SKIPPING".format(name))
+                except:
+                    logging.error("DOUBLE CRITICAL ERROR AGAIN WITH PRIMARY CLUSTER {0}; SKIPPING".format(name))
 
         if debug:
             logging.debug("Debug mode on - saving Ndb ASAP")