Merge branch '10401-limit-dir-expansion' closes #10401

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

diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index c28505b2254561d77701201ab02de04f6b7ee724..5eb923eb93079cc28bc0d1836c9f4b6dea6635a2 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',
@@ -29,15 +24,28 @@ setup(name='arvados-node-manager',
       url="https://arvados.org",
       license='GNU Affero General Public License, version 3.0',
       packages=find_packages(),
-      install_requires=[
-        'apache-libcloud',
-        'arvados-python-client',
-        'pykka',
-        'python-daemon',
-        ],
       scripts=['bin/arvados-node-manager'],
+      data_files=[
+          ('share/doc/arvados-node-manager', ['agpl-3.0.txt', 'README.rst']),
+      ],
+      install_requires=[
+          'apache-libcloud>=0.16',
+          'arvados-python-client>=0.1.20150206225333',
+          'future',
+          'pykka',
+          'python-daemon',
+          'setuptools'
+      ],
+      dependency_links=[
+          "https://github.com/curoverse/libcloud/archive/apache-libcloud-0.18.1.dev4.zip"
+      ],
       test_suite='tests',
-      tests_require=['mock>=1.0'],
+      tests_require=[
+          'requests',
+          'pbr<1.7.0',
+          'mock>=1.0',
+          'apache-libcloud==0.18.1.dev4',
+      ],
       zip_safe=False,
       cmdclass={'egg_info': tagger},
       )