[arvados] updated: 2.6.0-196-g72b8fdfb2

git repository hosting git at public.arvados.org
Thu Jun 1 18:33:15 UTC 2023


Summary of changes:
 sdk/cwl/setup.py            | 3 +--
 sdk/cwl/test_with_arvbox.sh | 8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

       via  72b8fdfb21636030f2e110eb5850beb5f08bb930 (commit)
      from  3c0b0c7d34d015fc6d4838cd7fa00a729c1898bb (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 72b8fdfb21636030f2e110eb5850beb5f08bb930
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Jun 1 14:32:47 2023 -0400

    20531: Remove urllib3 pin, add cwltest pin.
    
    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 62873eb8e..9af61a3d9 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -43,8 +43,7 @@ setup(name='arvados-cwl-runner',
           'networkx < 2.6',
           'msgpack==1.0.3',
           'importlib-metadata<5',
-          'setuptools>=40.3.0',
-          'urllib3 < 2'  # match constraint in cwl-utils
+          'setuptools>=40.3.0'
       ],
       data_files=[
           ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),
diff --git a/sdk/cwl/test_with_arvbox.sh b/sdk/cwl/test_with_arvbox.sh
index 6823a8e2a..b13f115b2 100755
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -104,10 +104,14 @@ fi
 
 set -x
 
+# 2.3.20230527113600 release of cwltest confirms that files exist on disk, since
+# our files are in Keep, all the tests fail.
+# We should add [optional] Arvados support to cwltest so it can access
+# Keep but for the time being just install the last working version.
 if [ "\$PYCMD" = "python3" ]; then
-    pip3 install cwltest
+    pip3 install 'cwltest<2.3.20230527113600'
 else
-    pip install cwltest
+    pip install 'cwltest<2.3.20230527113600'
 fi
 
 mkdir -p /tmp/cwltest

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list