Merge branch '21207-pytest'

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

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 545b4bfa01c70135585491dcb2c946bd847a4871..f9b0fcf91dcb614c9224fefe8b4836cbcffd74cd 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -3,28 +3,15 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-from __future__ import absolute_import
 import os
 import sys
 import re
 
 from setuptools import setup, find_packages
 
-SETUP_DIR = os.path.dirname(__file__) or '.'
-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:
-    short_tests_only = True
-    sys.argv.remove('--short-tests-only')
+version = arvados_version.get_version()
+README = os.path.join(arvados_version.SETUP_DIR, 'README.rst')
 
 setup(name='arvados_fuse',
       version=version,
@@ -43,22 +30,18 @@ setup(name='arvados_fuse',
           ('share/doc/arvados_fuse', ['agpl-3.0.txt', 'README.rst']),
       ],
       install_requires=[
-        'arvados-python-client{}'.format(pysdk_dep),
-        'llfuse >= 1.3.6',
-        'future',
+        *arvados_version.iter_dependencies(version),
+        'arvados-llfuse >= 1.5.1',
         'python-daemon',
         'ciso8601 >= 2.0.0',
         'setuptools',
         "prometheus_client"
         ],
-      extras_require={
-          ':python_version<"3"': ['pytz'],
-      },
+      python_requires="~=3.8",
       classifiers=[
-          'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 3',
       ],
       test_suite='tests',
-      tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
+      tests_require=['PyYAML', 'parameterized',],
       zip_safe=False
       )