From 90f4141a1087c33d78ee9031d3309f03ae69c285 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Thu, 29 Nov 2018 21:08:05 -0500 Subject: [PATCH] Make sure the dev version prefix is based on the latest tag in the repo, not the latest tag on the master branch (part 3). Make sure the change also works in Python 3. No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- sdk/cwl/arvados_version.py | 2 +- sdk/cwl/gittaggers.py | 2 +- sdk/pam/arvados_version.py | 2 +- sdk/python/arvados_version.py | 2 +- sdk/python/gittaggers.py | 2 +- services/dockercleaner/arvados_version.py | 2 +- services/fuse/arvados_version.py | 2 +- services/nodemanager/arvados_version.py | 2 +- tools/crunchstat-summary/arvados_version.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk/cwl/arvados_version.py b/sdk/cwl/arvados_version.py index c2a4d735fd..d13dd5ec53 100644 --- a/sdk/cwl/arvados_version.py +++ b/sdk/cwl/arvados_version.py @@ -11,7 +11,7 @@ SETUP_DIR = os.path.dirname(__file__) or '.' def git_latest_tag(): gittags = subprocess.check_output(['git', 'tag', '-l']).split() - gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + gittags.sort(key=lambda s: [int(u) for u in s.split(b'.')],reverse=True) return str(next(iter(gittags)).decode('utf-8')) def choose_version_from(): diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py index 873199d7e5..4dc8448476 100644 --- a/sdk/cwl/gittaggers.py +++ b/sdk/cwl/gittaggers.py @@ -30,7 +30,7 @@ class EggInfoFromGit(egg_info): """ def git_latest_tag(self): gittags = subprocess.check_output(['git', 'tag', '-l']).split() - gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + 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): diff --git a/sdk/pam/arvados_version.py b/sdk/pam/arvados_version.py index 3be72b51f0..2e6484cabd 100644 --- a/sdk/pam/arvados_version.py +++ b/sdk/pam/arvados_version.py @@ -9,7 +9,7 @@ import re def git_latest_tag(): gittags = subprocess.check_output(['git', 'tag', '-l']).split() - gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + 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(): diff --git a/sdk/python/arvados_version.py b/sdk/python/arvados_version.py index 3be72b51f0..2e6484cabd 100644 --- a/sdk/python/arvados_version.py +++ b/sdk/python/arvados_version.py @@ -9,7 +9,7 @@ import re def git_latest_tag(): gittags = subprocess.check_output(['git', 'tag', '-l']).split() - gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + 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(): diff --git a/sdk/python/gittaggers.py b/sdk/python/gittaggers.py index 213d39a24b..f3278fcc1d 100644 --- a/sdk/python/gittaggers.py +++ b/sdk/python/gittaggers.py @@ -14,7 +14,7 @@ class EggInfoFromGit(egg_info): """ def git_latest_tag(self): gittags = subprocess.check_output(['git', 'tag', '-l']).split() - gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + 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): diff --git a/services/dockercleaner/arvados_version.py b/services/dockercleaner/arvados_version.py index 3be72b51f0..2e6484cabd 100644 --- a/services/dockercleaner/arvados_version.py +++ b/services/dockercleaner/arvados_version.py @@ -9,7 +9,7 @@ import re def git_latest_tag(): gittags = subprocess.check_output(['git', 'tag', '-l']).split() - gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + 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(): diff --git a/services/fuse/arvados_version.py b/services/fuse/arvados_version.py index 3be72b51f0..2e6484cabd 100644 --- a/services/fuse/arvados_version.py +++ b/services/fuse/arvados_version.py @@ -9,7 +9,7 @@ import re def git_latest_tag(): gittags = subprocess.check_output(['git', 'tag', '-l']).split() - gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + 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(): diff --git a/services/nodemanager/arvados_version.py b/services/nodemanager/arvados_version.py index 3be72b51f0..2e6484cabd 100644 --- a/services/nodemanager/arvados_version.py +++ b/services/nodemanager/arvados_version.py @@ -9,7 +9,7 @@ import re def git_latest_tag(): gittags = subprocess.check_output(['git', 'tag', '-l']).split() - gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + 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(): diff --git a/tools/crunchstat-summary/arvados_version.py b/tools/crunchstat-summary/arvados_version.py index 3be72b51f0..2e6484cabd 100644 --- a/tools/crunchstat-summary/arvados_version.py +++ b/tools/crunchstat-summary/arvados_version.py @@ -9,7 +9,7 @@ import re def git_latest_tag(): gittags = subprocess.check_output(['git', 'tag', '-l']).split() - gittags.sort(key=lambda s: map(int, s.split('.')),reverse=True) + 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(): -- 2.30.2