projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18870: Fix typo
[arvados.git]
/
services
/
fuse
/
setup.py
diff --git
a/services/fuse/setup.py
b/services/fuse/setup.py
index 5a1aa809146db0f4b5a89e32390877963302e9e6..545b4bfa01c70135585491dcb2c946bd847a4871 100644
(file)
--- a/
services/fuse/setup.py
+++ b/
services/fuse/setup.py
@@
-1,4
+1,4
@@
-#!/usr/bin/env python
+#!/usr/bin/env python
3
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
@@
-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:
@@
-28,7
+33,7
@@
setup(name='arvados_fuse',
author='Arvados',
author_email='info@arvados.org',
url="https://arvados.org",
author='Arvados',
author_email='info@arvados.org',
url="https://arvados.org",
- download_url="https://github.com/
curoverse
/arvados.git",
+ download_url="https://github.com/
arvados
/arvados.git",
license='GNU Affero General Public License, version 3.0',
packages=['arvados_fuse'],
scripts=[
license='GNU Affero General Public License, version 3.0',
packages=['arvados_fuse'],
scripts=[
@@
-38,13
+43,21
@@
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'
,
- # llfuse 1.3.4 fails to install via pip
- '
llfuse >=1.2, <1.3.4
',
+ 'arvados-python-client
{}'.format(pysdk_dep)
,
+ 'llfuse >= 1.3.6',
+ '
future
',
'python-daemon',
'python-daemon',
- 'ciso8601 >=1.0.6, <2.0.0',
- 'setuptools'
+ 'ciso8601 >= 2.0.0',
+ 'setuptools',
+ "prometheus_client"
],
],
+ extras_require={
+ ':python_version<"3"': ['pytz'],
+ },
+ classifiers=[
+ 'Programming Language :: Python :: 2',
+ 'Programming Language :: Python :: 3',
+ ],
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