projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7478: Set arvados-node-size-id tag on node creation.
[arvados.git]
/
services
/
nodemanager
/
setup.py
diff --git
a/services/nodemanager/setup.py
b/services/nodemanager/setup.py
index f3764fc8e98bdb880682b33cd271f201ea215935..3d6b15c421d3028fc02b0bbf1ad51f36b66d96da 100644
(file)
--- a/
services/nodemanager/setup.py
+++ b/
services/nodemanager/setup.py
@@
-3,23
+3,26
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# 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
from setuptools import setup, find_packages
-SETUP_DIR = os.path.dirname(__file__) or
"."
+SETUP_DIR = os.path.dirname(__file__) or
'.'
README = os.path.join(SETUP_DIR, 'README.rst')
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, "arvnodeman")
+
+short_tests_only = False
+if '--short-tests-only' in sys.argv:
+ short_tests_only = True
+ sys.argv.remove('--short-tests-only')
setup(name='arvados-node-manager',
setup(name='arvados-node-manager',
- version=
'0.1'
,
+ version=
version
,
description='Arvados compute node manager',
long_description=open(README).read(),
author='Arvados',
description='Arvados compute node manager',
long_description=open(README).read(),
author='Arvados',
@@
-32,7
+35,7
@@
setup(name='arvados-node-manager',
('share/doc/arvados-node-manager', ['agpl-3.0.txt', 'README.rst']),
],
install_requires=[
('share/doc/arvados-node-manager', ['agpl-3.0.txt', 'README.rst']),
],
install_requires=[
- 'apache-libcloud>=2.
2
',
+ 'apache-libcloud>=2.
3
',
'arvados-python-client>=0.1.20170731145219',
'future',
'pykka',
'arvados-python-client>=0.1.20170731145219',
'future',
'pykka',
@@
-40,15
+43,14
@@
setup(name='arvados-node-manager',
'setuptools'
],
dependency_links=[
'setuptools'
],
dependency_links=[
- "https://github.com/curoverse/libcloud/archive/apache-libcloud-2.
2.2.dev2
.zip"
+ "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.2.2.dev2
',
+ 'apache-libcloud
>=2.3.1.dev1
',
],
],
- zip_safe=False,
- cmdclass={'egg_info': tagger},
+ zip_safe=False
)
)