5185: in project data collections tab, show description when available; otherwise...

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

diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 6923b074ac6c6d99ccca8c46ee274542180da75e..891b04f384a69a1acf2d4dd8c77dcebbe73b08b5 100644 (file)
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -1,36 +1,24 @@
 #!/usr/bin/env python
 
 import os
-import subprocess
-import time
+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')
 
-class TagBuildWithCommit(egg_info):
-    """Tag the build with the sha1 and date of the last git commit.
-
-    If a build tag has already been set (e.g., "egg_info -b", building
-    from source package), leave it alone.
-    """
-    def tags(self):
-        if self.tag_build is None:
-            git_tags = subprocess.check_output(
-                ['git', 'log', '--first-parent', '--max-count=1',
-                 '--format=format:%ct %h', SETUP_DIR]).split()
-            assert len(git_tags) == 2
-            git_tags[0] = time.strftime(
-                '%Y%m%d%H%M%S', time.gmtime(int(git_tags[0])))
-            self.tag_build = '.{}+{}'.format(*git_tags)
-        return egg_info.tags(self)
-
+try:
+    import gittaggers
+    tagger = gittaggers.EggInfoFromGit
+except ImportError:
+    tagger = egg_info_cmd.egg_info
 
 setup(name='arvados-node-manager',
       version='0.1',
       description='Arvados compute node manager',
-      long_description=open(os.path.join(SETUP_DIR, 'README.rst')).read(),
+      long_description=open(README).read(),
       author='Arvados',
       author_email='info@arvados.org',
       url="https://arvados.org",
@@ -40,11 +28,11 @@ setup(name='arvados-node-manager',
         'apache-libcloud',
         'arvados-python-client',
         'pykka',
-        'python-daemon<2',
+        'python-daemon',
         ],
       scripts=['bin/arvados-node-manager'],
       test_suite='tests',
       tests_require=['mock>=1.0'],
       zip_safe=False,
-      cmdclass={'egg_info': TagBuildWithCommit},
+      cmdclass={'egg_info': tagger},
       )