Fix python packaging conflicts with older pip refs #19330

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 33c1ffcbf1682471c31d6bfae46d3937139f9dde..e1a5077fb84c29e5b5a8a333a3bcacd1aaa4abd1 100644 (file)
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -39,11 +39,11 @@ setup(name='arvados-cwl-runner',
           'cwltool==3.1.20220907141119',
           'schema-salad==8.3.20220913105718',
           'arvados-python-client{}'.format(pysdk_dep),
-          'setuptools',
           'ciso8601 >= 2.0.0',
           'networkx < 2.6',
           'msgpack==1.0.3',
-          'importlib-metadata<5'
+          'importlib-metadata<5',
+          'setuptools>=40.3.0'
       ],
       data_files=[
           ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index d28df099879c907e5bd0bc5bd5498a4ae71fc2a1..5b6ad45ed9a32218c7c5eb95a86eed6a057cc687 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -52,10 +52,12 @@ setup(name='arvados-python-client',
           'google-auth<2',
           'httplib2 >=0.9.2, <0.20.2',
           'pycurl >=7.19.5.1, <7.45.0',
-          'ruamel.yaml >=0.15.54, <0.17.11',
+          'ruamel.yaml >=0.15.54, <0.17.22',
           'setuptools',
           'ws4py >=0.4.2',
-          'protobuf<4.0.0dev'
+          'protobuf<4.0.0dev',
+          'pyparsing<3',
+          'setuptools>=40.3.0',
       ],
       classifiers=[
           'Programming Language :: Python :: 3',