Merge branch '5305-arv-copy-fixes' closes #5305

[arvados.git] / services / fuse / setup.py

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 3ea28cbbba0ea3ddf8aa555d148e16fbf9c1dcd0..a7ae1c2e0694682857ca60b301e8ab4fb8a8d6fb 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -1,27 +1,19 @@
 #!/usr/bin/env python
 
 import os
-import subprocess
+import sys
+import setuptools.command.egg_info as egg_info_cmd
 
 from setuptools import setup, find_packages
 
-SETUP_DIR = os.path.dirname(__file__)
+SETUP_DIR = os.path.dirname(__file__) or '.'
 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:%ci %h', SETUP_DIR]).split()
-    assert len(git_tags) == 4
-except (AssertionError, OSError, subprocess.CalledProcessError):
-    pass
-else:
-    del git_tags[2]    # Remove timezone
-    for ii in [0, 1]:  # Remove non-digits from other datetime fields
-        git_tags[ii] = ''.join(c for c in git_tags[ii] if c.isdigit())
-    cmd_opts['egg_info']['tag_build'] = '.{}{}.{}'.format(*git_tags)
-
+    import gittaggers
+    tagger = gittaggers.EggInfoFromGit
+except ImportError:
+    tagger = egg_info_cmd.egg_info
 
 setup(name='arvados_fuse',
       version='0.1',
@@ -37,12 +29,13 @@ setup(name='arvados_fuse',
         'bin/arv-mount'
         ],
       install_requires=[
-        'arvados-python-client>=0.1.1411069908.8ba7f94',  # 2014-09-18
+        'arvados-python-client>=0.1.20150303143450',
         'llfuse',
-        'python-daemon'
+        'python-daemon',
+        'ciso8601'
         ],
       test_suite='tests',
       tests_require=['PyYAML'],
       zip_safe=False,
-      options=cmd_opts,
+      cmdclass={'egg_info': tagger},
       )