13200:fix python gittagers version with latest git tag and timestamp

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

diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 5eb923eb93079cc28bc0d1836c9f4b6dea6635a2..437e95e272a61d4a6a0e8d2ee4e0e977a14ae014 100644 (file)
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
 import os
 import sys
@@ -9,14 +12,18 @@ from setuptools import setup, find_packages
 SETUP_DIR = os.path.dirname(__file__) or "."
 README = os.path.join(SETUP_DIR, 'README.rst')
 
-try:
-    import gittaggers
-    tagger = gittaggers.EggInfoFromGit
-except ImportError:
-    tagger = egg_info_cmd.egg_info
+tagger = egg_info_cmd.egg_info
+version = os.environ.get("ARVADOS_BUILDING_VERSION")
+if not version:
+    version = ""
+    try:
+        import gittaggers
+        tagger = gittaggers.EggInfoFromGit
+    except ImportError:
+        pass
 
 setup(name='arvados-node-manager',
-      version='0.1',
+      version=version,
       description='Arvados compute node manager',
       long_description=open(README).read(),
       author='Arvados',
@@ -29,22 +36,19 @@ setup(name='arvados-node-manager',
           ('share/doc/arvados-node-manager', ['agpl-3.0.txt', 'README.rst']),
       ],
       install_requires=[
-          'apache-libcloud>=0.16',
-          'arvados-python-client>=0.1.20150206225333',
+          'apache-libcloud>=2.3',
+          'arvados-python-client>=0.1.20170731145219',
           '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=[
           'requests',
           'pbr<1.7.0',
           'mock>=1.0',
-          'apache-libcloud==0.18.1.dev4',
+          'apache-libcloud>=2.3',
       ],
       zip_safe=False,
       cmdclass={'egg_info': tagger},