14885: Adds python2 conditional pytz import

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

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 2358eb928fd6b2cccda04c7f7e08bf2657b42d00..9b4b997cdc68dd14353e4621a77da7f30f7146a1 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -3,24 +3,18 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+from __future__ import absolute_import
 import os
 import sys
-import setuptools.command.egg_info as egg_info_cmd
+import re
 
 from setuptools import setup, find_packages
 
 SETUP_DIR = os.path.dirname(__file__) or '.'
 README = os.path.join(SETUP_DIR, 'README.rst')
 
-tagger = egg_info_cmd.egg_info
-version = os.environ.get("ARVADOS_BUILDING_VERSION")
-if not version:
-    version = "0.1"
-    try:
-        import gittaggers
-        tagger = gittaggers.EggInfoFromGit
-    except ImportError:
-        pass
+import arvados_version
+version = arvados_version.get_version(SETUP_DIR, "arvados_fuse")
 
 short_tests_only = False
 if '--short-tests-only' in sys.argv:
@@ -45,13 +39,16 @@ setup(name='arvados_fuse',
       ],
       install_requires=[
         'arvados-python-client >= 0.1.20151118035730',
-        'llfuse>=1.2',
+        # llfuse 1.3.4 fails to install via pip
+        'llfuse >=1.2, <1.3.4',
         'python-daemon',
-        'ciso8601',
+        'ciso8601 >= 2.0.0',
         'setuptools'
         ],
+      extras_require={
+          ':python_version<"3"': ['pytz'],
+      },
       test_suite='tests',
       tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
-      zip_safe=False,
-      cmdclass={'egg_info': tagger},
+      zip_safe=False
       )