projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12934: Fix gofmt
[arvados.git]
/
services
/
nodemanager
/
setup.py
diff --git
a/services/nodemanager/setup.py
b/services/nodemanager/setup.py
index 59d95e3d22f1231030359141298d79f2a547ad8b..64545eb0f977a39338373291d2e271762cd61b7a 100644
(file)
--- a/
services/nodemanager/setup.py
+++ b/
services/nodemanager/setup.py
@@
-12,14
+12,18
@@
from setuptools import setup, find_packages
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')
-try:
- import gittaggers
- tagger = gittaggers.EggInfoFromGit
-except ImportError:
- tagger = egg_info_cmd.egg_info
+tagger = egg_info_cmd.egg_info
+version = os.environ.get("ARVADOS_BUILDING_VERSION")
+if not version:
+ version = "0.1"
+ try:
+ import gittaggers
+ tagger = gittaggers.EggInfoFromGit
+ except ImportError:
+ pass
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,22
+36,22
@@
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>=
0.20
',
- 'arvados-python-client>=0.1.201
50206225333
',
+ 'apache-libcloud>=
2.2
',
+ 'arvados-python-client>=0.1.201
70731145219
',
'future',
'pykka',
'python-daemon',
'setuptools'
],
dependency_links=[
'future',
'pykka',
'python-daemon',
'setuptools'
],
dependency_links=[
- "https://github.com/curoverse/libcloud/archive/apache-libcloud-
0.20
.2.dev3.zip"
+ "https://github.com/curoverse/libcloud/archive/apache-libcloud-
2.2
.2.dev3.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==
0.20
.2.dev3',
+ 'apache-libcloud==
2.2
.2.dev3',
],
zip_safe=False,
cmdclass={'egg_info': tagger},
],
zip_safe=False,
cmdclass={'egg_info': tagger},