19385: more WIP

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

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index c3d8dc3aeb2d1e4177f17bbbb7fc90e363a1d29e..52a9a6c208cf73a304eb7650e67b5ad5a0d8ab2a 100644 (file)
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -383,7 +383,8 @@ def main(args=sys.argv[1:],
 
     if arvargs.workflow.startswith("arvwf:") or workflow_uuid_pattern.match(arvargs.workflow) or arvargs.workflow.startswith("keep:"):
         executor.loadingContext.do_validate = False
-        executor.fast_submit = True
+        if arvargs.submit:
+            executor.fast_submit = True
 
     return cwltool.main.main(args=arvargs,
                              stdout=stdout,

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index bf5a9a9f1f70d6aa8643596a38d9f553ed07d9d2..68a3446010bf79192a8f3b703c071f6d1c61ab23 100644 (file)
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -37,7 +37,7 @@ setup(name='arvados-cwl-runner',
       # build.
       install_requires=[
           'cwltool==3.1.20230119183816',
-          'schema-salad>8.3.20220913105718',
+          'schema-salad==8.3.20230109181937.dev6+gca19f37',
           'arvados-python-client{}'.format(pysdk_dep),
           'ciso8601 >= 2.0.0',
           'networkx < 2.6',