[ARVADOS] updated: 1.1.3-305-g36d3420

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


Summary of changes:
 sdk/python/setup.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

       via  36d342058d5343f07f262ea0f11f13e0285396ce (commit)
      from  e718f4d30d1be2b108f1c213bd19ff178fe75d7c (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 36d342058d5343f07f262ea0f11f13e0285396ce
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed Apr 4 14:48:20 2018 -0300

    13200: rollback to previous state and raise in case version not defined
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index fdbd541..e62d100 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -13,15 +13,16 @@ 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 = __version__
+version = os.environ.get("ARVADOS_BUILDING_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()
+        version = vtag.git_latest_tag()
     except ImportError:
-        pass
+        raise
 
 short_tests_only = False
 if '--short-tests-only' in sys.argv:

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list