[arvados] updated: 2.7.0-4962-gdf566fda61
git repository hosting
git at public.arvados.org
Fri Oct 6 16:06:25 UTC 2023
Summary of changes:
sdk/cwl/setup.py | 3 ++-
sdk/cwl/tests/wf/{runin-wf.cwl => runseparate-wf.cwl} | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
copy sdk/cwl/tests/wf/{runin-wf.cwl => runseparate-wf.cwl} (90%)
via df566fda61e84d8d99ac133ecc3dbc8726dff40f (commit)
from 5dc68f920a97034ad92e07caacf92165279c0a63 (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 df566fda61e84d8d99ac133ecc3dbc8726dff40f
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Fri Oct 6 11:25:35 2023 -0400
20825: Fix zipp dependency, add missing file
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 92f0952af2..1be2c119c2 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -43,7 +43,8 @@ setup(name='arvados-cwl-runner',
'networkx < 2.6',
'msgpack==1.0.3',
'importlib-metadata<5',
- 'setuptools>=40.3.0'
+ 'setuptools>=40.3.0',
+ 'zipp<3.16.0'
],
data_files=[
('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),
diff --git a/sdk/cwl/tests/wf/runseparate-wf.cwl b/sdk/cwl/tests/wf/runseparate-wf.cwl
new file mode 100644
index 0000000000..e4ab627256
--- /dev/null
+++ b/sdk/cwl/tests/wf/runseparate-wf.cwl
@@ -0,0 +1,68 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+class: Workflow
+cwlVersion: v1.0
+$namespaces:
+ arv: "http://arvados.org/cwl#"
+inputs:
+ sleeptime:
+ type: int
+ default: 5
+ fileblub:
+ type: File
+ default:
+ class: File
+ location: keep:d7514270f356df848477718d58308cc4+94/a
+ secondaryFiles:
+ - class: File
+ location: keep:d7514270f356df848477718d58308cc4+94/b
+outputs:
+ out:
+ type: string
+ outputSource: substep/out
+requirements:
+ SubworkflowFeatureRequirement: {}
+ ScatterFeatureRequirement: {}
+ InlineJavascriptRequirement: {}
+ StepInputExpressionRequirement: {}
+steps:
+ substep:
+ in:
+ sleeptime: sleeptime
+ fileblub: fileblub
+ out: [out]
+ hints:
+ - class: arv:SeparateRunner
+ runnerProcessName: $("sleeptime "+inputs.sleeptime)
+ - class: DockerRequirement
+ dockerPull: arvados/jobs:2.2.2
+ run:
+ class: Workflow
+ id: mysub
+ inputs:
+ fileblub: File
+ sleeptime: int
+ outputs:
+ out:
+ type: string
+ outputSource: sleep1/out
+ steps:
+ sleep1:
+ in:
+ fileblub: fileblub
+ out: [out]
+ run:
+ class: CommandLineTool
+ id: subtool
+ inputs:
+ fileblub:
+ type: File
+ inputBinding: {position: 1}
+ outputs:
+ out:
+ type: string
+ outputBinding:
+ outputEval: 'out'
+ baseCommand: cat
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list