X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2dbd8ea3bc22f8f0eecf4bbe752d0bec8bf88726..e45c5654ed1122792b177b9aa86b71c0e840f9f3:/services/dockercleaner/setup.py

diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index b287bd00d2..74053ec1ae 100644
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -3,21 +3,23 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+from __future__ import absolute_import
 import os
 import sys
-import setuptools.command.egg_info as egg_info_cmd
+import re
 
 from setuptools import setup, find_packages
 
-tagger = egg_info_cmd.egg_info
-version = os.environ.get("ARVADOS_BUILDING_VERSION")
-if not version:
-    try:
-        import arvados_version
-        vtag = arvados_version.VersionInfoFromGit()
-        version = vtag.git_latest_tag() + vtag.git_timestamp_tag()
-    except ImportError:
-        pass
+SETUP_DIR = os.path.dirname(__file__) or '.'
+README = os.path.join(SETUP_DIR, 'README.rst')
+
+import arvados_version
+version = arvados_version.get_version(SETUP_DIR, "arvados_docker")
+
+short_tests_only = False
+if '--short-tests-only' in sys.argv:
+    short_tests_only = True
+    sys.argv.remove('--short-tests-only')
 
 setup(name="arvados-docker-cleaner",
       version=version,
@@ -32,7 +34,8 @@ setup(name="arvados-docker-cleaner",
           'console_scripts': ['arvados-docker-cleaner=arvados_docker.cleaner:main'],
       },
       data_files=[
-          ('share/doc/arvados-docker-cleaner', ['agpl-3.0.txt', 'arvados-docker-cleaner.service']),
+          ('share/doc/arvados-docker-cleaner', ['agpl-3.0.txt']),
+          ('/lib/systemd/system/', ['arvados-docker-cleaner.service']),
       ],
       install_requires=[
           'docker-py==1.7.2',
@@ -43,6 +46,5 @@ setup(name="arvados-docker-cleaner",
           'mock',
       ],
       test_suite='tests',
-      zip_safe=False,
-      cmdclass={'egg_info': tagger},
+      zip_safe=False
 )