From 24f9bc348608393ec88d5632e3b4a627420dcba1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Fri, 23 Mar 2018 18:50:23 -0300 Subject: [PATCH] Trying some str formatting MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit refs #13200 Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- sdk/python/arvados_version.py | 2 +- sdk/python/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/python/arvados_version.py b/sdk/python/arvados_version.py index 1d55981b95..db46417ea6 100644 --- 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 1695159c6c..1adc19f997 100644 --- 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 -- 2.30.2