From 91fbb52cbe2637e1a86bc0f615545f5e909f7317 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Mon, 8 Aug 2022 18:28:58 -0400 Subject: [PATCH] Fix python packaging conflicts with older pip refs #19330 Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- sdk/cwl/setup.py | 4 ++-- sdk/python/setup.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py index 33c1ffcbf1..e1a5077fb8 100644 --- 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 d28df09987..5b6ad45ed9 100644 --- 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', -- 2.30.2