Trying some str formatting
authorJavier Bértoli <jbertoli@veritasgenetics.com>
Fri, 23 Mar 2018 21:39:14 +0000 (18:39 -0300)
committerFernando Monserrat <fernando.monserrat@gmail.com>
Mon, 2 Apr 2018 13:56:54 +0000 (10:56 -0300)
refs #13200
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@veritasgenetics.com>

sdk/python/arvados_version.py
sdk/python/setup.py

index bc8ce7347b0745c1720223ad16c24e9566755c41..1d55981b9583f994a387c44dbeb3f84765e6a6f7 100644 (file)
@@ -17,4 +17,4 @@ class VersionInfoFromGit():
         gitinfo = subprocess.check_output(
             ['git', 'log', '--first-parent', '--max-count=1',
              '--format=format:%ct', '.']).strip()
-        return time.strftime('.%Y%m%d%H%M%S', time.gmtime(int(gitinfo)))
+        return str(time.strftime('.%Y%m%d%H%M%S', time.gmtime(int(gitinfo))))
index 1adc19f997ef880a777e662090de9f4882aa93fe..1695159c6c3a4b4cf7326c5eb72ed8b5c737ca2f 100644 (file)
@@ -18,7 +18,7 @@ if not version:
     try:
         import arvados_version
         vtag = arvados_version.VersionInfoFromGit()
-        version = vtag.git_latest_tag() + vtag.git_timestamp_tag()
+        version = str(vtag.git_latest_tag() + vtag.git_timestamp_tag())
     except ImportError:
         pass