Merge branch '18842-arv-mount-disk-config' refs #18842

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

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index cbc9cb23edf5f36f0c6a83120d8c21cc0f582241..d0c46f132040aa400645473ddf347c53be135d23 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: AGPL-3.0
@@ -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:
@@ -28,7 +33,7 @@ setup(name='arvados_fuse',
       author='Arvados',
       author_email='info@arvados.org',
       url="https://arvados.org",
-      download_url="https://github.com/curoverse/arvados.git",
+      download_url="https://github.com/arvados/arvados.git",
       license='GNU Affero General Public License, version 3.0',
       packages=['arvados_fuse'],
       scripts=[
@@ -38,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.3.4 fails to install via pip
-        'llfuse >=1.2, <1.3.4',
+        'arvados-python-client{}'.format(pysdk_dep),
+        'llfuse >= 1.3.6',
+        'future',
         'python-daemon',
         'ciso8601 >= 2.0.0',
         'setuptools',
@@ -49,7 +54,11 @@ setup(name='arvados_fuse',
       extras_require={
           ':python_version<"3"': ['pytz'],
       },
+      classifiers=[
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 3',
+      ],
       test_suite='tests',
-      tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
+      tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML', 'parameterized',],
       zip_safe=False
       )