projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #13200 Merge branch '13200-new-package-versioning-jb'
[arvados.git]
/
services
/
nodemanager
/
setup.py
diff --git
a/services/nodemanager/setup.py
b/services/nodemanager/setup.py
index 7b023570b3d221593b8973eb4e640bda87a29dcb..9ae1135b88cd1d2b2eb4f6260a694eb5728972f1 100644
(file)
--- a/
services/nodemanager/setup.py
+++ b/
services/nodemanager/setup.py
@@
-15,13
+15,14
@@
README = os.path.join(SETUP_DIR, 'README.rst')
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
- version = "0.1"
try:
try:
- import gittaggers
- tagger = gittaggers.EggInfoFromGit
+ import arvados_version
+ vtag = arvados_version.VersionInfoFromGit()
+ version = vtag.git_latest_tag() + vtag.git_timestamp_tag()
except ImportError:
pass
except ImportError:
pass
+
setup(name='arvados-node-manager',
version=version,
description='Arvados compute node manager',
setup(name='arvados-node-manager',
version=version,
description='Arvados compute node manager',
@@
-36,22
+37,19
@@
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',
'python-daemon',
'setuptools'
],
'arvados-python-client>=0.1.20170731145219',
'future',
'pykka',
'python-daemon',
'setuptools'
],
- dependency_links=[
- "https://github.com/curoverse/libcloud/archive/apache-libcloud-2.2.2.dev4.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.dev4
',
+ 'apache-libcloud
>=2.3
',
],
zip_safe=False,
cmdclass={'egg_info': tagger},
],
zip_safe=False,
cmdclass={'egg_info': tagger},