Fix find_latest_release algorithm (#128)

* Fix find_latest_release algorithm * Fix recommandation missing Co-authored-by: biomaj-dev <biomaj-dev@maestro-biomaj-dev.maestro.pasteur.fr>
genouest · Jul 7, 2021 · 1bae0d6 · 1bae0d6
1 parent f1f6ed6
commit 1bae0d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/biomaj/workflow.py b/biomaj/workflow.py
@@ -26,6 +26,8 @@
 from biomaj_zipkin.zipkin import Zipkin
 from yapsy.PluginManager import PluginManager
 
+from packaging.version import parse
+
 
 class Workflow(object):
     """
@@ -516,26 +518,16 @@ def __findLastRelease(self, releases):
         Try to find most release from releases input array
         '''
         release = releases[0]
-        release_elts = re.split(r'\.|-', release)
+        release_version = parse(release)
         logging.debug('found a release %s' % (release))
         for rel in releases:
             if rel == release:
                 continue
             logging.debug('compare next release %s' % (rel))
-            rel_elts = re.split(r'\.|-', rel)
-            index = 0
-            for rel_elt in rel_elts:
-                logging.debug("compare release major,minor,etc. : %s >? %s" % (rel_elt, release_elts[index]))
-                try:
-                    if int(rel_elt) > int(release_elts[index]):
-                        release = rel
-                        release_elts = re.split(r'\.|-', release)
-                        logging.debug("found newer release %s" % (rel))
-                        break
-                except ValueError:
-                    pass
-                finally:
-                    index += 1
+            next_release = parse(rel)
+            if next_release > release_version:
+                release = rel
+                release_version = next_release
         return release
 
     def wf_release(self):

diff --git a/requirements.txt b/requirements.txt
@@ -17,3 +17,4 @@ redis
 influxdb
 Yapsy==1.12.2
 Jinja2
+packaging
diff --git a/setup.py b/setup.py
@@ -72,7 +72,8 @@ def run(self):
                          'redis',
                          'elasticsearch',
                          'influxdb',
-                         'Yapsy==1.12.2'
+                         'Yapsy==1.12.2',
+                         'packaging'
                          ],
     'tests_require': ['nose', 'mock'],
     'test_suite': 'nose.collector',