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 d5c572f2ed46885231bde9edbb31b980f0b7f5c2..cb0fc8d88afae0b7c688aeec4f73a548716b39a1 100644 (file)
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -3,23 +3,15 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-from __future__ import absolute_import
 import os
 import sys
 import re
 
 from setuptools import setup, find_packages
 
-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')
+version = arvados_version.get_version()
+README = os.path.join(arvados_version.SETUP_DIR, 'README.rst')
 
 setup(name="arvados-docker-cleaner",
       version=version,
@@ -37,18 +29,11 @@ setup(name="arvados-docker-cleaner",
           ('share/doc/arvados-docker-cleaner', ['agpl-3.0.txt', 'arvados-docker-cleaner.service']),
       ],
       install_requires=[
-          # The requirements for the docker library broke when requests started
-          # supporting urllib3 2.0.
-          # See <https://github.com/docker/docker-py/issues/3113>.
-          # Make sure we get a version with the bugfix, assuming Python is
-          # recent enough.
-          'docker>=6.1.0; python_version>"3.6"',
-          # If Python is too old, install the latest version we can and pin
-          # urllib3 ourselves.
-          'docker~=5.0; python_version<"3.7"',
-          'urllib3~=1.26; python_version<"3.7"',
+          *arvados_version.iter_dependencies(version),
+          'docker>=6.1.0',
           'setuptools',
       ],
+      python_requires="~=3.8",
       test_suite='tests',
       zip_safe=False
 )