projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15209: Makes python components packages ask for current PySDK version.
[arvados.git]
/
services
/
fuse
/
setup.py
diff --git
a/services/fuse/setup.py
b/services/fuse/setup.py
index 5a1aa809146db0f4b5a89e32390877963302e9e6..d95fc1d8114912b0b787ebd7bb4e7bc87aecffb0 100644
(file)
--- a/
services/fuse/setup.py
+++ b/
services/fuse/setup.py
@@
-15,6
+15,11
@@
README = os.path.join(SETUP_DIR, 'README.rst')
import arvados_version
version = arvados_version.get_version(SETUP_DIR, "arvados_fuse")
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 = False
if '--short-tests-only' in sys.argv:
@@
-38,13
+43,17
@@
setup(name='arvados_fuse',
('share/doc/arvados_fuse', ['agpl-3.0.txt', 'README.rst']),
],
install_requires=[
('share/doc/arvados_fuse', ['agpl-3.0.txt', 'README.rst']),
],
install_requires=[
- 'arvados-python-client
>= 0.1.20151118035730'
,
+ 'arvados-python-client
=={}'.format(pysdk_dep)
,
# llfuse 1.3.4 fails to install via pip
'llfuse >=1.2, <1.3.4',
'python-daemon',
# llfuse 1.3.4 fails to install via pip
'llfuse >=1.2, <1.3.4',
'python-daemon',
- 'ciso8601 >=1.0.6, <2.0.0',
- 'setuptools'
+ 'ciso8601 >= 2.0.0',
+ 'setuptools',
+ "prometheus_client"
],
],
+ extras_require={
+ ':python_version<"3"': ['pytz'],
+ },
test_suite='tests',
tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
zip_safe=False
test_suite='tests',
tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
zip_safe=False