[ARVADOS] updated: 1.1.3-301-ge98135d

Git user git at public.curoverse.com
Wed Apr 4 10:37:48 EDT 2018


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

       via  e98135d49ac0b42a5f8c134602d9df052b864dde (commit)
      from  26aa596a7435009675acdc4ef583c23b4c94dd71 (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 e98135d49ac0b42a5f8c134602d9df052b864dde
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed Apr 4 11:37:41 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/gittaggers.py b/sdk/python/gittaggers.py
index ccf25c4..a94f14c 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_latest_tag()+self.git_timestamp_tag()
+            self.tag_build = self.git_timestamp_tag()
         return egg_info.tags(self)
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index de5851f..6e283ed 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -20,7 +20,7 @@ if not version:
         tagger = gittaggers.EggInfoFromGit
         import arvados_version
         vtag = arvados_version.VersionInfoFromGit()
-        version = vtag.git_latest_tag() + vtag.git_timestamp_tag()
+        version = vtag.git_latest_tag()
     except ImportError:
         pass
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list