10383: Merge branch 'master' into 10383-arv-put-incremental-upload

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

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index b589b4858309a4b33d15df8cb7be7b71d6293e20..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',
@@ -39,11 +44,13 @@ setup(name='arvados-python-client',
           ('share/doc/arvados-python-client', ['LICENSE-2.0.txt', 'README.rst']),
       ],
       install_requires=[
+          'google-api-python-client==1.4.2',
+          'oauth2client >=1.4.6, <2',
           'ciso8601',
-          'google-api-python-client',
           'httplib2',
-          'pycurl>=7.19.5.1',
-          'python-gflags',
+          'pycurl >=7.19.5.1, <7.21.5',
+          'python-gflags<3.0',
+          'setuptools',
           'ws4py'
       ],
       test_suite='tests',