Merge branch 'master' into 4926-browser-based-upload

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

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index a1b1dca72ecd32b9abf7288a93d85f6372e56427..ffd8240a89a17e97bab323e59b3e37741f446437 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -24,7 +24,7 @@ class TagBuildWithCommit(egg_info):
             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)
+            self.tag_build = '.{}+{}'.format(*git_tags)
         return egg_info.tags(self)
 
 
@@ -42,9 +42,9 @@ setup(name='arvados_fuse',
         'bin/arv-mount'
         ],
       install_requires=[
-        'arvados-python-client>=0.1.20141103223015.68dae83',
+        'arvados-python-client>=0.1.20141203150737.277b3c7',
         'llfuse',
-        'python-daemon'
+        'python-daemon<2',
         ],
       test_suite='tests',
       tests_require=['PyYAML'],