5037: Merge branch 'master' into 5037-nonocache

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

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index dac09bffd6db60ce01fdd3731424075fe78241ed..ca28025fea64ae6b388af4388337814494a8c0c8 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -1,10 +1,19 @@
 #!/usr/bin/env python
 
 import os
+import sys
+import setuptools.command.egg_info as egg_info_cmd
 
 from setuptools import setup, find_packages
 
-README = os.path.join(os.path.dirname(__file__), 'README.rst')
+SETUP_DIR = os.path.dirname(__file__) or '.'
+README = os.path.join(SETUP_DIR, 'README.rst')
+
+try:
+    import gittaggers
+    tagger = gittaggers.EggInfoFromGit
+except ImportError:
+    tagger = egg_info_cmd.egg_info
 
 setup(name='arvados-python-client',
       version='0.1',
@@ -23,15 +32,19 @@ 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'
         ],
       test_suite='tests',
       tests_require=['mock>=1.0', 'PyYAML'],
-      zip_safe=False)
+      zip_safe=False,
+      cmdclass={'egg_info': tagger},
+      )