projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16100: Move test to integration suite to avoid logging errors.
[arvados.git]
/
services
/
nodemanager
/
setup.py
diff --git
a/services/nodemanager/setup.py
b/services/nodemanager/setup.py
index 1e41f3dad2fd32cfa3f42c461f2b21362796cb8e..a2b9a0ca92458a5c3b7b2b4af414b5451b922b75 100644
(file)
--- a/
services/nodemanager/setup.py
+++ b/
services/nodemanager/setup.py
@@
-15,6
+15,11
@@
README = os.path.join(SETUP_DIR, 'README.rst')
import arvados_version
version = arvados_version.get_version(SETUP_DIR, "arvnodeman")
import arvados_version
version = arvados_version.get_version(SETUP_DIR, "arvnodeman")
+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:
@@
-32,26
+37,23
@@
setup(name='arvados-node-manager',
packages=find_packages(),
scripts=['bin/arvados-node-manager'],
data_files=[
packages=find_packages(),
scripts=['bin/arvados-node-manager'],
data_files=[
- ('share/doc/arvados-node-manager', ['agpl-3.0.txt', 'README.rst']),
+ ('share/doc/arvados-node-manager', ['agpl-3.0.txt', 'README.rst'
, 'arvados-node-manager.service'
]),
],
install_requires=[
],
install_requires=[
- 'apache-libcloud
>=2.3.1.dev1',
- 'arvados-python-client
>=0.1.20170731145219'
,
+ 'apache-libcloud
==2.5.0', # 2.6.0 cannot create azure nodes, #15649
+ 'arvados-python-client
{}'.format(pysdk_dep)
,
'future',
'future',
- 'pykka',
+ 'pykka
< 2
',
'python-daemon',
'setuptools',
'subprocess32>=3.5.1',
],
'python-daemon',
'setuptools',
'subprocess32>=3.5.1',
],
- dependency_links=[
- "https://github.com/curoverse/libcloud/archive/apache-libcloud-2.3.1.dev1.zip"
- ],
test_suite='tests',
tests_require=[
'requests',
'pbr<1.7.0',
'mock>=1.0',
test_suite='tests',
tests_require=[
'requests',
'pbr<1.7.0',
'mock>=1.0',
- 'apache-libcloud
>=2.3.1.dev1
',
+ 'apache-libcloud
==2.5.0
',
'subprocess32>=3.5.1',
],
zip_safe=False
'subprocess32>=3.5.1',
],
zip_safe=False