X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f98e0188777b3e2d229c968824b3e64307dae4e6..185c640d59da6666897312b4f8ccd04b6e170f2a:/sdk/cwl/gittaggers.py diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py index 8ccb6645de..d6a4c24a78 100644 --- a/sdk/cwl/gittaggers.py +++ b/sdk/cwl/gittaggers.py @@ -2,6 +2,9 @@ # # SPDX-License-Identifier: Apache-2.0 +from builtins import str +from builtins import next + from setuptools.command.egg_info import egg_info import subprocess import time @@ -29,9 +32,9 @@ class EggInfoFromGit(egg_info): from source package), leave it alone. """ def git_latest_tag(self): - gitinfo = subprocess.check_output( - ['git', 'describe', '--abbrev=0']).strip() - return str(gitinfo.decode('utf-8')) + gittags = subprocess.check_output(['git', 'tag', '-l']).split() + gittags.sort(key=lambda s: [int(u) for u in s.split(b'.')],reverse=True) + return str(next(iter(gittags)).decode('utf-8')) def git_timestamp_tag(self): gitinfo = subprocess.check_output(