projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6507: Avoid packages with local tags in Node Manager setup.py.
[arvados.git]
/
services
/
nodemanager
/
setup.py
diff --git
a/services/nodemanager/setup.py
b/services/nodemanager/setup.py
index c28505b2254561d77701201ab02de04f6b7ee724..dc7fc0d5f8cb5264410031a901adceb195bbde6b 100644
(file)
--- a/
services/nodemanager/setup.py
+++ b/
services/nodemanager/setup.py
@@
-2,23
+2,18
@@
import os
import sys
import os
import sys
+import setuptools.command.egg_info as egg_info_cmd
from setuptools import setup, find_packages
from setuptools import setup, find_packages
-from setuptools.command.egg_info import egg_info
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')
-
if '--sha1-tag' in sys.argv
:
+
try
:
import gittaggers
import gittaggers
- tagger = gittaggers.TagBuildWithCommitDateAndSha1
- sys.argv.remove('--sha1-tag')
-else:
- try:
- import gittaggers
- tagger = gittaggers.TagBuildWithCommitDate
- except ImportError:
- tagger = egg_info
+ tagger = gittaggers.EggInfoFromGit
+except ImportError:
+ tagger = egg_info_cmd.egg_info
setup(name='arvados-node-manager',
version='0.1',
setup(name='arvados-node-manager',
version='0.1',
@@
-30,14
+25,17
@@
setup(name='arvados-node-manager',
license='GNU Affero General Public License, version 3.0',
packages=find_packages(),
install_requires=[
license='GNU Affero General Public License, version 3.0',
packages=find_packages(),
install_requires=[
- 'apache-libcloud',
- 'arvados-python-client',
+ 'apache-libcloud
>=0.16
',
+ 'arvados-python-client
>=0.1.20150206225333
',
'pykka',
'python-daemon',
],
'pykka',
'python-daemon',
],
+ dependency_links = [
+ "git+git://github.com/curoverse/libcloud.git@8c16e5c84388e6557c5e1791a2111e571a0bf9de#egg=apache_libcloud-0.18.0.dev1"
+ ],
scripts=['bin/arvados-node-manager'],
test_suite='tests',
scripts=['bin/arvados-node-manager'],
test_suite='tests',
- tests_require=['mock>=1.0'],
+ tests_require=['mock>=1.0'
, "apache-libcloud==0.18.0.dev1"
],
zip_safe=False,
cmdclass={'egg_info': tagger},
)
zip_safe=False,
cmdclass={'egg_info': tagger},
)