13200: split version and build_tag for python sdk

[arvados.git] / sdk / python / setup.py

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 2c9021d72deb40ee5033c7d04b54790de7027bcf..6e283ed59c7e15dc28442259a3180a136c7ff6d5 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -14,17 +14,16 @@ README = os.path.join(SETUP_DIR, 'README.rst')
 
 tagger = egg_info_cmd.egg_info
 version = os.environ.get("ARVADOS_BUILDING_VERSION")
-
-tagger = gittaggers.EggInfoFromGit
 if not version:
     try:
         import gittaggers
-        vtag = gittaggers.EggInfoFromGit
-        version = vtag.git_latest_tag()+vtag.git_timestamp_tag()
+        tagger = gittaggers.EggInfoFromGit
+        import arvados_version
+        vtag = arvados_version.VersionInfoFromGit()
+        version = vtag.git_latest_tag()
     except ImportError:
         pass
 
-
 short_tests_only = False
 if '--short-tests-only' in sys.argv:
     short_tests_only = True