Merge branch 'master' into 6219-fuse-performance-testing

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

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index c6f9424fddd77f048a98314707788516a3a0f5ba..b314cc8c399e08c94239a5d66578eb9ecb80df97 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -1,27 +1,19 @@
 #!/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
 
-SETUP_DIR = os.path.dirname(__file__)
+SETUP_DIR = os.path.dirname(__file__) or '.'
 README = os.path.join(SETUP_DIR, 'README.rst')
 
-cmd_opts = {'egg_info': {}}
 try:
-    git_tags = subprocess.check_output(
-        ['git', 'log', '--first-parent', '--max-count=1',
-         '--format=format:%ct %h', SETUP_DIR],
-        stderr=open('/dev/null','w')).split()
-    assert len(git_tags) == 2
-except (AssertionError, OSError, subprocess.CalledProcessError):
-    pass
-else:
-    git_tags[0] = time.strftime('%Y%m%d%H%M%S', time.gmtime(int(git_tags[0])))
-    cmd_opts['egg_info']['tag_build'] = '.{}.{}'.format(*git_tags)
-
+    import gittaggers
+    tagger = gittaggers.EggInfoFromGit
+except ImportError:
+    tagger = egg_info_cmd.egg_info
 
 setup(name='arvados_fuse',
       version='0.1',
@@ -37,12 +29,13 @@ setup(name='arvados_fuse',
         'bin/arv-mount'
         ],
       install_requires=[
-        'arvados-python-client>=0.1.20141103223015.68dae83',
+        'arvados-python-client >= 0.1.20150625175218',
         'llfuse',
-        'python-daemon'
+        'python-daemon',
+        'ciso8601'
         ],
       test_suite='tests',
-      tests_require=['PyYAML'],
+      tests_require=['mock>=1.0', 'PyYAML'],
       zip_safe=False,
-      options=cmd_opts,
+      cmdclass={'egg_info': tagger},
       )