Merge branch 'master' into 4523-full-text-search

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

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 97f4c1d808f2462dce6c2ac4edf00a1ef6339357..c65501c58eee8c3a5ccfe59268ee35e44768855b 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -2,23 +2,18 @@
 
 import os
 import sys
+import setuptools.command.egg_info as egg_info_cmd
 
 from setuptools import setup, find_packages
-from setuptools.command.egg_info import egg_info
 
 SETUP_DIR = os.path.dirname(__file__) or '.'
 README = os.path.join(SETUP_DIR, 'README.rst')
 
-if '--sha1-tag' in sys.argv:
+try:
     import gittaggers
-    tagger = gittaggers.TagBuildWithCommitDateAndSha1
-    sys.argv.remove('--sha1-tag')
-else:
-    try:
-        import gittaggers
-        tagger = gittaggers.TagBuildWithCommitDate
-    except ImportError:
-        tagger = egg_info
+    tagger = gittaggers.EggInfoFromGit
+except ImportError:
+    tagger = egg_info_cmd.egg_info
 
 setup(name='arvados_fuse',
       version='0.1',
@@ -29,7 +24,7 @@ setup(name='arvados_fuse',
       url="https://arvados.org",
       download_url="https://github.com/curoverse/arvados.git",
       license='GNU Affero General Public License, version 3.0',
-      packages=find_packages(),
+      packages=['arvados_fuse'],
       scripts=[
         'bin/arv-mount'
         ],