Merge branch '5011-thread-safe-test' refs #5011

[arvados.git] / services / nodemanager / setup.py

diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index c28505b2254561d77701201ab02de04f6b7ee724..6830e809f9b2283a65ceb8ad5ddb9bdda4115e44 100644 (file)
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -2,23 +2,18 @@
 
 import os
 import sys
+import setuptools.command.egg_info as egg_info_cmd
 
 from setuptools import setup, find_packages
-from setuptools.command.egg_info import egg_info
 
 SETUP_DIR = os.path.dirname(__file__) or "."
 README = os.path.join(SETUP_DIR, 'README.rst')
 
-if '--sha1-tag' in sys.argv:
+try:
     import gittaggers
-    tagger = gittaggers.TagBuildWithCommitDateAndSha1
-    sys.argv.remove('--sha1-tag')
-else:
-    try:
-        import gittaggers
-        tagger = gittaggers.TagBuildWithCommitDate
-    except ImportError:
-        tagger = egg_info
+    tagger = gittaggers.EggInfoFromGit
+except ImportError:
+    tagger = egg_info_cmd.egg_info
 
 setup(name='arvados-node-manager',
       version='0.1',
@@ -31,7 +26,7 @@ setup(name='arvados-node-manager',
       packages=find_packages(),
       install_requires=[
         'apache-libcloud',
-        'arvados-python-client',
+        'arvados-python-client>=0.1.20150206225333',
         'pykka',
         'python-daemon',
         ],