Merge branch '21535-multi-wf-delete'

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

diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index 6a6a96a0455eee17d5f5bb1b725b69f767805cae..cb0fc8d88afae0b7c688aeec4f73a548716b39a1 100644 (file)
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -5,19 +5,13 @@
 
 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:
-    version = "0.1"
-    try:
-        import gittaggers
-        tagger = gittaggers.EggInfoFromGit
-    except ImportError:
-        pass
+import arvados_version
+version = arvados_version.get_version()
+README = os.path.join(arvados_version.SETUP_DIR, 'README.rst')
 
 setup(name="arvados-docker-cleaner",
       version=version,
@@ -25,7 +19,7 @@ setup(name="arvados-docker-cleaner",
       author="Arvados",
       author_email="info@arvados.org",
       url="https://arvados.org",
-      download_url="https://github.com/curoverse/arvados.git",
+      download_url="https://github.com/arvados/arvados.git",
       license="GNU Affero General Public License version 3.0",
       packages=find_packages(),
       entry_points={
@@ -35,14 +29,11 @@ setup(name="arvados-docker-cleaner",
           ('share/doc/arvados-docker-cleaner', ['agpl-3.0.txt', 'arvados-docker-cleaner.service']),
       ],
       install_requires=[
-          'docker-py==1.7.2',
+          *arvados_version.iter_dependencies(version),
+          'docker>=6.1.0',
           'setuptools',
       ],
-      tests_require=[
-          'pbr<1.7.0',
-          'mock',
-      ],
+      python_requires="~=3.8",
       test_suite='tests',
-      zip_safe=False,
-      cmdclass={'egg_info': tagger},
+      zip_safe=False
 )