Trying some str formatting

refs #13200
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@veritasgenetics.com>

diff --git a/sdk/python/arvados_version.py b/sdk/python/arvados_version.py
index 1d55981b9583f994a387c44dbeb3f84765e6a6f7..db46417ea6d711dd7e7fe3e872c67de92f844469 100644 (file)
--- a/sdk/python/arvados_version.py
+++ b/sdk/python/arvados_version.py
@@ -11,7 +11,7 @@ class VersionInfoFromGit():
     def git_latest_tag(self):
         gitinfo = subprocess.check_output(
             ['git', 'describe', '--abbrev=0']).strip()
-        return str(gitinfo)
+        return str(gitinfo.decode('utf-8'))
 
     def git_timestamp_tag(self):
         gitinfo = subprocess.check_output(

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 1695159c6c3a4b4cf7326c5eb72ed8b5c737ca2f..1adc19f997ef880a777e662090de9f4882aa93fe 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -18,7 +18,7 @@ if not version:
     try:
         import arvados_version
         vtag = arvados_version.VersionInfoFromGit()
-        version = str(vtag.git_latest_tag() + vtag.git_timestamp_tag())
+        version = vtag.git_latest_tag() + vtag.git_timestamp_tag()
     except ImportError:
         pass