Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix find_latest_release algorithm #128

Merged
merged 2 commits into from
Jul 7, 2021
Merged

Fix find_latest_release algorithm #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61d86ca
Fix find_latest_release algorithm
Jul 7, 2021
008cdfc
Fix recommandation missing
Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions biomaj/workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
from biomaj_zipkin.zipkin import Zipkin
from yapsy.PluginManager import PluginManager

from packaging.version import parse


class Workflow(object):
"""
Expand Down Expand Up @@ -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):
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ redis
influxdb
Yapsy==1.12.2
Jinja2
packaging
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down