projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '8236-nodemanager-watchdog' closes #8236
[arvados.git]
/
sdk
/
python
/
setup.py
diff --git
a/sdk/python/setup.py
b/sdk/python/setup.py
index c547d87ab5c6def0d880ea5a685374f796ac02c5..e0aae9625eb54d82eb4ee983696487079fa0d441 100644
(file)
--- a/
sdk/python/setup.py
+++ b/
sdk/python/setup.py
@@
-15,6
+15,11
@@
try:
except ImportError:
tagger = egg_info_cmd.egg_info
except ImportError:
tagger = egg_info_cmd.egg_info
+short_tests_only = False
+if '--short-tests-only' in sys.argv:
+ short_tests_only = True
+ sys.argv.remove('--short-tests-only')
+
setup(name='arvados-python-client',
version='0.1',
description='Arvados client library',
setup(name='arvados-python-client',
version='0.1',
description='Arvados client library',
@@
-40,7
+45,8
@@
setup(name='arvados-python-client',
],
install_requires=[
'google-api-python-client==1.4.2',
],
install_requires=[
'google-api-python-client==1.4.2',
- 'oauth2client==1.5.1',
+ 'oauth2client >=1.4.6, <2',
+ 'pyasn1-modules==0.0.5',
'ciso8601',
'httplib2',
'pycurl >=7.19.5.1, <7.21.5',
'ciso8601',
'httplib2',
'pycurl >=7.19.5.1, <7.21.5',