21406: Declare python_requires~=3.8 in all packages

This is what we officially support as of Arvados 3.0, and saying so
helps prevent trouble if users try to install our packages on a too-old
Python.

Remove other requirements that are redundant after this change.

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 1da0d53ce8813d29bb788ce86fb35b96a94646c8..223af951596e3d47c3073c0b74733b3a549acc20 100644 (file)
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -44,14 +44,11 @@ setup(name='arvados-cwl-runner',
           'msgpack==1.0.3',
           'importlib-metadata<5',
           'setuptools>=40.3.0',
-
-          # zipp 3.16 dropped support for Python 3.7
-          'zipp<3.16.0; python_version<"3.8"'
       ],
       data_files=[
           ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),
       ],
-      python_requires=">=3.5, <4",
+      python_requires="~=3.8",
       classifiers=[
           'Programming Language :: Python :: 3',
       ],

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 284a460f1a175e7e081ebb862a276fb4e8e45e3e..e3d66aa472e655e4dbbd92d755c8adf28f9b8f0b 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -116,7 +116,6 @@ setup(name='arvados-python-client',
       ],
       install_requires=[
           'ciso8601 >=2.0.0',
-          'dataclasses; python_version<"3.7"',
           'future',
           'google-api-core <2.11.0', # 2.11.0rc1 is incompatible with google-auth<2
           'google-api-python-client >=2.1.0',
@@ -127,11 +126,9 @@ setup(name='arvados-python-client',
           'pyparsing <3',
           'ruamel.yaml >=0.15.54, <0.17.22',
           'setuptools >=40.3.0',
-          # As of 4.8.0rc1, typing_extensions does not parse in Python 3.7
-          'typing_extensions >=3.7.4, <4.8; python_version<"3.8"',
           'websockets >=11.0',
-          'websockets ~=11.0; python_version<"3.8"',
       ],
+      python_requires="~=3.8",
       classifiers=[
           'Programming Language :: Python :: 3',
       ],

diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index d5c572f2ed46885231bde9edbb31b980f0b7f5c2..2b386c70b47aa2c925b87aedff14838297b88315 100644 (file)
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -37,18 +37,10 @@ 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"',
+          'docker>=6.1.0',
           'setuptools',
       ],
+      python_requires="~=3.8",
       test_suite='tests',
       zip_safe=False
 )

diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index c3753afc9891149e807411bf41e1e5d81590399d..b04829652e948b4de22c3c433620287c4fb51ef1 100644 (file)
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -51,6 +51,7 @@ setup(name='arvados_fuse',
         'setuptools',
         "prometheus_client"
         ],
+      python_requires="~=3.8",
       classifiers=[
           'Programming Language :: Python :: 3',
       ],

diff --git a/tools/crunchstat-summary/setup.py b/tools/crunchstat-summary/setup.py
index a881390e47e893fb1e22eb46926716f58f2c7c9e..98be9f27025b4c3c7828626dd7676fddbe845dfd 100755 (executable)
--- a/tools/crunchstat-summary/setup.py
+++ b/tools/crunchstat-summary/setup.py
@@ -45,6 +45,7 @@ setup(name='crunchstat_summary',
       install_requires=[
           'arvados-python-client{}'.format(pysdk_dep),
       ],
+      python_requires="~=3.8",
       test_suite='tests',
       tests_require=['pbr<1.7.0', 'mock>=1.0'],
       zip_safe=False,

diff --git a/tools/user-activity/setup.py b/tools/user-activity/setup.py
index 41f8f66a079a0cd7025165d6381c9945a6f0c3bd..4b7ec16b934881540e45081e77f9c67ba01519c5 100755 (executable)
--- a/tools/user-activity/setup.py
+++ b/tools/user-activity/setup.py
@@ -33,5 +33,6 @@ setup(name='arvados-user-activity',
       install_requires=[
           'arvados-python-client >= 2.2.0.dev20201118185221',
       ],
+      python_requires="~=3.8",
       zip_safe=True,
 )