X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2ca602f880757f016f8d0d212b8851818decc718..28c6bbeeed6b228d51666914bcd845d05500107e:/services/fuse/setup.py diff --git a/services/fuse/setup.py b/services/fuse/setup.py index 3ea28cbbba..1e72fee99a 100644 --- a/services/fuse/setup.py +++ b/services/fuse/setup.py @@ -2,6 +2,7 @@ import os import subprocess +import time from setuptools import setup, find_packages @@ -12,15 +13,13 @@ 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 + '--format=format:%ct %h', SETUP_DIR]).split() + assert len(git_tags) == 2 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) + 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) setup(name='arvados_fuse', @@ -37,7 +36,7 @@ setup(name='arvados_fuse', 'bin/arv-mount' ], install_requires=[ - 'arvados-python-client>=0.1.1411069908.8ba7f94', # 2014-09-18 + 'arvados-python-client>=0.1.20141103223015.68dae83', 'llfuse', 'python-daemon' ],