Merge branch 'master' into 4156-cli-tests

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

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 64fba0c27474602edbebd8d7bda3aced6a89ae8a..bc1fab9d60ac3c1ee833f5f2772e6a7330ee9434 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -13,7 +13,9 @@ cmd_opts = {'egg_info': {}}
 try:
     git_tags = subprocess.check_output(
         ['git', 'log', '--first-parent', '--max-count=1',
-         '--format=format:%ct %h', SETUP_DIR]).split()
+         '--format=format:%ct %h', SETUP_DIR],
+        stderr=open('/dev/null','w')
+        ).split()
     assert len(git_tags) == 2
 except (AssertionError, OSError, subprocess.CalledProcessError):
     pass
@@ -39,12 +41,14 @@ setup(name='arvados-python-client',
         'bin/arv-ls',
         'bin/arv-normalize',
         'bin/arv-put',
-        'bin/arv-ws',
+        'bin/arv-run',
+        'bin/arv-ws'
         ],
       install_requires=[
         'python-gflags',
         'google-api-python-client',
         'httplib2',
+        'requests>=2.4',
         'urllib3',
         'ws4py'
         ],