From: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
Date: Tue, 16 Jul 2019 16:29:04 +0000 (-0400)
Subject: Merge branch 'master' into 14965-arv-mount-py-three
X-Git-Tag: 2.0.0~248^2~7
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/7653054635e3f4f84da3f2b6862cd2c02fbe3fd4

Merge branch 'master' into 14965-arv-mount-py-three

refs #14965

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
---

7653054635e3f4f84da3f2b6862cd2c02fbe3fd4
diff --cc services/fuse/setup.py
index 0bc4a0b653,0439d7d0ca..ae1aa019bb
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@@ -38,9 -43,9 +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.4 fails to install via pip
 -        'llfuse >=1.2, <1.3.4',
++        'llfuse >= 1.3.6',
 +        'future',
          'python-daemon',
          'ciso8601 >= 2.0.0',
          'setuptools',