[ARVADOS] updated: 1.1.3-304-ge718f4d

Git user git at public.curoverse.com
Wed Apr 4 13:27:48 EDT 2018


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

       via  e718f4d30d1be2b108f1c213bd19ff178fe75d7c (commit)
      from  39f5c737d1074cf85ea32c76bfe9623e64cd0c5b (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 e718f4d30d1be2b108f1c213bd19ff178fe75d7c
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed Apr 4 14:27:40 2018 -0300

    13200: test assigning __version__
    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 f3c67e6..db46417 100644
--- a/sdk/python/arvados_version.py
+++ b/sdk/python/arvados_version.py
@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from setuptools.command.egg_info import egg_info
 import subprocess
 import time
 
@@ -19,8 +18,3 @@ 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/setup.py b/sdk/python/setup.py
index de5851f..fdbd541 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -13,11 +13,10 @@ SETUP_DIR = os.path.dirname(__file__) or '.'
 README = os.path.join(SETUP_DIR, 'README.rst')
 
 tagger = egg_info_cmd.egg_info
-version = os.environ.get("ARVADOS_BUILDING_VERSION")
+#version = os.environ.get("ARVADOS_BUILDING_VERSION")
+version = __version__
 if not version:
     try:
-        import gittaggers
-        tagger = gittaggers.EggInfoFromGit
         import arvados_version
         vtag = arvados_version.VersionInfoFromGit()
         version = vtag.git_latest_tag() + vtag.git_timestamp_tag()

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list