3706: Remove superfluous conditional.

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

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 7506931344cab165f38ef893921908bba1b409c1..64fba0c27474602edbebd8d7bda3aced6a89ae8a 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -1,27 +1,55 @@
-from setuptools import setup
+#!/usr/bin/env python
+
+import os
 import subprocess
+import time
+
+from setuptools import setup, find_packages
+
+SETUP_DIR = os.path.dirname(__file__)
+README = os.path.join(SETUP_DIR, 'README.rst')
+
+cmd_opts = {'egg_info': {}}
+try:
+    git_tags = subprocess.check_output(
+        ['git', 'log', '--first-parent', '--max-count=1',
+         '--format=format:%ct %h', SETUP_DIR]).split()
+    assert len(git_tags) == 2
+except (AssertionError, OSError, subprocess.CalledProcessError):
+    pass
+else:
+    git_tags[0] = time.strftime('%Y%m%d%H%M%S', time.gmtime(int(git_tags[0])))
+    cmd_opts['egg_info']['tag_build'] = '.{}.{}'.format(*git_tags)
 
-minor_version = subprocess.check_output(
-    ['git', 'log', '--format=format:%ct.%h', '-n1', '.'])
 
 setup(name='arvados-python-client',
-      version='0.1.' + minor_version,
+      version='0.1',
       description='Arvados client library',
-      url='https://arvados.org',
+      long_description=open(README).read(),
       author='Arvados',
       author_email='info@arvados.org',
+      url="https://arvados.org",
+      download_url="https://github.com/curoverse/arvados.git",
       license='Apache 2.0',
-      packages=['arvados'],
+      packages=find_packages(),
       scripts=[
+        'bin/arv-copy',
         'bin/arv-get',
+        'bin/arv-keepdocker',
+        'bin/arv-ls',
+        'bin/arv-normalize',
         'bin/arv-put',
-        'bin/arv-mount',
+        'bin/arv-ws',
         ],
       install_requires=[
         'python-gflags',
         'google-api-python-client',
         'httplib2',
         'urllib3',
-        'fusepy',
+        'ws4py'
         ],
-      zip_safe=False)
+      test_suite='tests',
+      tests_require=['mock>=1.0', 'PyYAML'],
+      zip_safe=False,
+      options=cmd_opts,
+      )