Merge branch '11100-cr-output-ttl'

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

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index b589b4858309a4b33d15df8cb7be7b71d6293e20..ed380e9a00831dd65f5a62ef0d12f1382f0972f3 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',
@@ -30,6 +35,7 @@ setup(name='arvados-python-client',
           'bin/arv-get',
           'bin/arv-keepdocker',
           'bin/arv-ls',
+          'bin/arv-migrate-docker19',
           'bin/arv-normalize',
           'bin/arv-put',
           'bin/arv-run',
@@ -39,12 +45,15 @@ 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',
-          'ws4py'
+          'pycurl >=7.19.5.1, <7.21.5',
+          'python-gflags<3.0',
+          'setuptools',
+          'ws4py<0.4',
+          'ruamel.yaml==0.13.7'
       ],
       test_suite='tests',
       tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],