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 <wvandewege@veritasgenetics.com>

diff --git a/sdk/cwl/arvados_version.py b/sdk/cwl/arvados_version.py
index c2a4d735fd2aae6e593616c1f634029a5bcd4b59..d13dd5ec538e678268d7b79836d745ba89d46047 100644 (file)
--- 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 873199d7e5a6ffc4ca5ffd480ef976c5dc9f7fe5..4dc8448476123934dae7193fe680141671a2b7ec 100644 (file)
--- 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 3be72b51f09f0da2ea9ace87531840ef84a2e35d..2e6484cabdf1e71d39f5fe21139b29c2ce09ad93 100644 (file)
--- 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 3be72b51f09f0da2ea9ace87531840ef84a2e35d..2e6484cabdf1e71d39f5fe21139b29c2ce09ad93 100644 (file)
--- 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 213d39a24b071e089a2d05115cddafa3403f3cb8..f3278fcc1d5e7aeab1f6748f90bc80040e6fce37 100644 (file)
--- 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 3be72b51f09f0da2ea9ace87531840ef84a2e35d..2e6484cabdf1e71d39f5fe21139b29c2ce09ad93 100644 (file)
--- 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 3be72b51f09f0da2ea9ace87531840ef84a2e35d..2e6484cabdf1e71d39f5fe21139b29c2ce09ad93 100644 (file)
--- 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 3be72b51f09f0da2ea9ace87531840ef84a2e35d..2e6484cabdf1e71d39f5fe21139b29c2ce09ad93 100644 (file)
--- 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 3be72b51f09f0da2ea9ace87531840ef84a2e35d..2e6484cabdf1e71d39f5fe21139b29c2ce09ad93 100644 (file)
--- 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():