10383: Fix for making arv-keep-get tests pass.

[arvados.git] / sdk / python / setup.py

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index c547d87ab5c6def0d880ea5a685374f796ac02c5..d470ab4d0046f01a40017d9aaa58dc0e231b1c51 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
 
+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',
@@ -40,11 +45,12 @@ setup(name='arvados-python-client',
       ],
       install_requires=[
           'google-api-python-client==1.4.2',
-          'oauth2client==1.5.1',
+          'oauth2client >=1.4.6, <2',
           'ciso8601',
           'httplib2',
           'pycurl >=7.19.5.1, <7.21.5',
           'python-gflags<3.0',
+          'setuptools',
           'ws4py'
       ],
       test_suite='tests',