Avoid broken llfuse 1.3.4 ("pip install" fails).

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

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 8bc11315fa20834e3d1222044fd24155cb76fdcb..153d1423e54d5f65f914d73da9e07769cc88351c 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -3,25 +3,19 @@
 #
 # 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:
-    try:
-        import arvados_version
-        vtag = arvados_version.VersionInfoFromGit()
-        version = vtag.git_latest_tag() + vtag.git_timestamp_tag()
-    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:
     short_tests_only = True
@@ -45,13 +39,13 @@ 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',
         'setuptools'
         ],
       test_suite='tests',
       tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
-      zip_safe=False,
-      cmdclass={'egg_info': tagger},
+      zip_safe=False
       )