projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '9567-keep-web-session-test'
[arvados.git]
/
services
/
fuse
/
setup.py
diff --git
a/services/fuse/setup.py
b/services/fuse/setup.py
index 98bd2d5adf63ca08100b6e97a3876c2cf6133310..d7e1a8afb302b26ae582bc5a3a5aaecc9514ae7c 100644
(file)
--- a/
services/fuse/setup.py
+++ b/
services/fuse/setup.py
@@
-2,9
+2,9
@@
import os
import sys
import os
import sys
+import setuptools.command.egg_info as egg_info_cmd
from setuptools import setup, find_packages
from setuptools import setup, find_packages
-from setuptools.command.egg_info import egg_info
SETUP_DIR = os.path.dirname(__file__) or '.'
README = os.path.join(SETUP_DIR, 'README.rst')
SETUP_DIR = os.path.dirname(__file__) or '.'
README = os.path.join(SETUP_DIR, 'README.rst')
@@
-13,7
+13,12
@@
try:
import gittaggers
tagger = gittaggers.EggInfoFromGit
except ImportError:
import gittaggers
tagger = gittaggers.EggInfoFromGit
except ImportError:
- tagger = egg_info
+ tagger = egg_info_cmd.egg_info
+
+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',
version='0.1',
setup(name='arvados_fuse',
version='0.1',
@@
-28,13
+33,17
@@
setup(name='arvados_fuse',
scripts=[
'bin/arv-mount'
],
scripts=[
'bin/arv-mount'
],
+ data_files=[
+ ('share/doc/arvados_fuse', ['agpl-3.0.txt', 'README.rst']),
+ ],
install_requires=[
install_requires=[
- 'arvados-python-client
>=0.1.20141203150737.277b3c7
',
- 'llfuse',
+ 'arvados-python-client
>= 0.1.20151118035730
',
+ 'llfuse
==0.41.1
',
'python-daemon',
'python-daemon',
+ 'ciso8601'
],
test_suite='tests',
],
test_suite='tests',
- tests_require=['PyYAML'],
+ tests_require=['
pbr<1.7.0', 'mock>=1.0', '
PyYAML'],
zip_safe=False,
cmdclass={'egg_info': tagger},
)
zip_safe=False,
cmdclass={'egg_info': tagger},
)