Merge branch 'master' into 6465-optimize-workbench-integration-tests

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

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 98bd2d5adf63ca08100b6e97a3876c2cf6133310..3833493598cf05e288dc31f0153732dbccdca907 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -2,9 +2,9 @@
 
 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')
@@ -13,7 +13,7 @@ try:
     import gittaggers
     tagger = gittaggers.EggInfoFromGit
 except ImportError:
-    tagger = egg_info
+    tagger = egg_info_cmd.egg_info
 
 setup(name='arvados_fuse',
       version='0.1',
@@ -29,12 +29,13 @@ setup(name='arvados_fuse',
         'bin/arv-mount'
         ],
       install_requires=[
-        'arvados-python-client>=0.1.20141203150737.277b3c7',
-        'llfuse',
+        'arvados-python-client >= 0.1.20150625175218',
+        'llfuse>=0.40',
         'python-daemon',
+        'ciso8601'
         ],
       test_suite='tests',
-      tests_require=['PyYAML'],
+      tests_require=['mock>=1.0', 'PyYAML'],
       zip_safe=False,
       cmdclass={'egg_info': tagger},
       )