X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f8067dd18b72705f3317e85745e87cffc9e25313..546b44cf5dfba972d2f5f91fa4434e9cb64fa0cd:/services/nodemanager/setup.py diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py index c28505b225..6830e809f9 100644 --- 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', ],