[arvados] updated: 2.4.2-5-g0e09004c3

git repository hosting git at public.arvados.org
Mon Aug 8 22:29:42 UTC 2022


Summary of changes:
 sdk/cwl/setup.py    | 4 ++--
 sdk/python/setup.py | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

       via  0e09004c3b1a309e8ad2a84904c6d26016ec90b5 (commit)
      from  5412a019a3f0c1cb2bff3b344f63e9a48a911026 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0e09004c3b1a309e8ad2a84904c6d26016ec90b5
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Aug 8 18:28:58 2022 -0400

    Fix python packaging conflicts with older pip refs #19330
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 66cda19f4..19b12a5e9 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -39,10 +39,10 @@ setup(name='arvados-cwl-runner',
           'cwltool==3.1.20220623174452',
           'schema-salad==8.3.20220801194920',
           'arvados-python-client{}'.format(pysdk_dep),
-          'setuptools',
           'ciso8601 >= 2.0.0',
           'networkx < 2.6',
-          'msgpack==1.0.3'
+          'msgpack==1.0.3',
+          '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 d28df0998..5b6ad45ed 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',

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list