Merge branch 'master' into 15531-logincluster-migrate

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

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 59213e8eb1e89d7aabee92b4a5ca7df0d94dda15..ae1aa019bbb43f55aee277afea61cc309ca8cbd7 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -15,6 +15,11 @@ README = os.path.join(SETUP_DIR, 'README.rst')
 
 import arvados_version
 version = arvados_version.get_version(SETUP_DIR, "arvados_fuse")
+if os.environ.get('ARVADOS_BUILDING_VERSION', False):
+    pysdk_dep = "=={}".format(version)
+else:
+    # On dev releases, arvados-python-client may have a different timestamp
+    pysdk_dep = "<={}".format(version)
 
 short_tests_only = False
 if '--short-tests-only' in sys.argv:
@@ -38,8 +43,9 @@ setup(name='arvados_fuse',
           ('share/doc/arvados_fuse', ['agpl-3.0.txt', 'README.rst']),
       ],
       install_requires=[
-        'arvados-python-client >= 0.1.20151118035730',
-        'llfuse >=1.2, <=1.3.6',
+        'arvados-python-client{}'.format(pysdk_dep),
+        'llfuse >= 1.3.6',
+        'future',
         'python-daemon',
         'ciso8601 >= 2.0.0',
         'setuptools',