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 c200a84649151511a6ed781d51eb59c46df3f578..3833493598cf05e288dc31f0153732dbccdca907 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -1,10 +1,19 @@
 #!/usr/bin/env python
 
 import os
+import sys
+import setuptools.command.egg_info as egg_info_cmd
 
 from setuptools import setup, find_packages
 
-README = os.path.join(os.path.dirname(__file__), 'README.rst')
+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
 
 setup(name='arvados_fuse',
       version='0.1',
@@ -20,10 +29,13 @@ setup(name='arvados_fuse',
         'bin/arv-mount'
         ],
       install_requires=[
-        'arvados-python-client>=0.1.1411070090',  # 2014-09-18
-        'llfuse',
-        'python-daemon'
+        'arvados-python-client >= 0.1.20150625175218',
+        'llfuse>=0.40',
+        'python-daemon',
+        'ciso8601'
         ],
       test_suite='tests',
-      tests_require=['PyYAML'],
-      zip_safe=False)
+      tests_require=['mock>=1.0', 'PyYAML'],
+      zip_safe=False,
+      cmdclass={'egg_info': tagger},
+      )