Merge branch '8784-dir-listings'

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

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 759e8ff67edf1ec8b99b0de86ee8a3e4602b73b7..c2ac6a9db8f8a1d4aadbf0b3f02e9e0d31d2b9c5 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
 
 import os
 import sys
@@ -15,6 +18,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 +38,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,13 +48,14 @@ 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',
-          'httplib2',
-          'pycurl >=7.19.5.1, <7.21.5',
-          'python-gflags<3.0',
-          'ws4py'
+          'future',
+          'google-api-python-client >=1.6.2, <1.7',
+          'httplib2 >=0.9.2',
+          'pycurl >=7.19.5.1',
+          'ruamel.yaml >=0.13.7',
+          'setuptools',
+          'ws4py <0.4',
       ],
       test_suite='tests',
       tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],