projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14845: Fix inconsistent timeout error message.
[arvados.git]
/
services
/
fuse
/
setup.py
diff --git
a/services/fuse/setup.py
b/services/fuse/setup.py
index fca1edf6bc25603beac62e6b88041cf481da43ee..5a1aa809146db0f4b5a89e32390877963302e9e6 100644
(file)
--- a/
services/fuse/setup.py
+++ b/
services/fuse/setup.py
@@
-1,22
+1,28
@@
#!/usr/bin/env python
#!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+from __future__ import absolute_import
import os
import sys
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')
from setuptools import setup, find_packages
SETUP_DIR = os.path.dirname(__file__) or '.'
README = os.path.join(SETUP_DIR, 'README.rst')
-try:
- import gittaggers
- tagger = gittaggers.EggInfoFromGit
-except ImportError:
- tagger = egg_info_cmd.egg_info
+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
+ sys.argv.remove('--short-tests-only')
setup(name='arvados_fuse',
setup(name='arvados_fuse',
- version=
'0.1'
,
+ version=
version
,
description='Arvados FUSE driver',
long_description=open(README).read(),
author='Arvados',
description='Arvados FUSE driver',
long_description=open(README).read(),
author='Arvados',
@@
-33,12
+39,13
@@
setup(name='arvados_fuse',
],
install_requires=[
'arvados-python-client >= 0.1.20151118035730',
],
install_requires=[
'arvados-python-client >= 0.1.20151118035730',
- 'llfuse==0.41.1',
+ # llfuse 1.3.4 fails to install via pip
+ 'llfuse >=1.2, <1.3.4',
'python-daemon',
'python-daemon',
- 'ciso8601'
+ 'ciso8601 >=1.0.6, <2.0.0',
+ 'setuptools'
],
test_suite='tests',
tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
],
test_suite='tests',
tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
- zip_safe=False,
- cmdclass={'egg_info': tagger},
+ zip_safe=False
)
)