[ARVADOS] updated: 1.1.3-303-g39f5c73

[Git user]

Summary of changes:
 sdk/python/arvados_version.py | 6 ++++++
 sdk/python/gittaggers.py      | 2 +-
 sdk/python/setup.py           | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

       via  39f5c737d1074cf85ea32c76bfe9623e64cd0c5b (commit)
      from  9ff3bca44ba767c5cc80ee3e81c9c9a5a91b261d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 39f5c737d1074cf85ea32c76bfe9623e64cd0c5b
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed Apr 4 13:28:11 2018 -0300

    13200: split version and build_tag for python sdk
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/sdk/python/arvados_version.py b/sdk/python/arvados_version.py
index db46417..f3c67e6 100644
--- a/sdk/python/arvados_version.py
+++ b/sdk/python/arvados_version.py
@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from setuptools.command.egg_info import egg_info
 import subprocess
 import time
 
@@ -18,3 +19,8 @@ class VersionInfoFromGit():
             ['git', 'log', '--first-parent', '--max-count=1',
              '--format=format:%ct', '.']).strip()
         return str(time.strftime('.%Y%m%d%H%M%S', time.gmtime(int(gitinfo))))
+    
+    def tags(self):
+        if self.tag_build is None:
+            self.tag_build = self.git_latest_tag()+self.git_timestamp_tag()
+        return egg_info.tags(self)
\ No newline at end of file
diff --git a/sdk/python/gittaggers.py b/sdk/python/gittaggers.py
index a94f14c..ccf25c4 100644
--- a/sdk/python/gittaggers.py
+++ b/sdk/python/gittaggers.py
@@ -25,5 +25,5 @@ class EggInfoFromGit(egg_info):
 
     def tags(self):
         if self.tag_build is None:
-            self.tag_build = self.git_timestamp_tag()
+            self.tag_build = self.git_latest_tag()+self.git_timestamp_tag()
         return egg_info.tags(self)
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 09964f1..de5851f 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -8,7 +8,7 @@ import sys
 import setuptools.command.egg_info as egg_info_cmd
 
 from setuptools import setup, find_packages
-version = ""
+
 SETUP_DIR = os.path.dirname(__file__) or '.'
 README = os.path.join(SETUP_DIR, 'README.rst')
 
@@ -20,7 +20,7 @@ if not version:
         tagger = gittaggers.EggInfoFromGit
         import arvados_version
         vtag = arvados_version.VersionInfoFromGit()
-        version = vtag.git_latest_tag()
+        version = vtag.git_latest_tag() + vtag.git_timestamp_tag()
     except ImportError:
         pass
 

-----------------------------------------------------------------------


hooks/post-receive
--