Skip to content

Commit 65f95a3

Browse files
mr-cmr-c
committed
Squashed 'cwltool/schemas/' changes from 1550753..aa320ec
aa320ec Merge pull request common-workflow-language#342 from common-workflow-language/fix-mystery-package-errors 3c6eaff Update for rename of argparse2cwl to argparse2tool b14404b remove errant jsonldPredicate 7f116da Merge pull request common-workflow-language#339 from common-workflow-language/dockerOutputDirectory 4f65d1f Add test for dockerOutputDirectory option of DockerRequirement. cb1f928 Merge pull request common-workflow-language#335 from common-workflow-language/output-literals d8b6c8f Add tests for file and directory literals in output as produced by expression tool. ee3bb1c Merge pull request common-workflow-language#324 from common-workflow-language/secondaryfiles-array 5e6c2d4 Add NLeSC's Xenon cbe1c8d Merge pull request common-workflow-language#334 from StarvingMarvin/master 8300e43 output ids must start with '#' in draft-2 f87d218 draft-3 test fixes: explicit output for args 8b10319 Fixes for draft-2 tests: adding explicit args output 83ed4b4 Merge remote-tracking branch 'rabix-cwl/master' e0a5e7c Merge pull request common-workflow-language#328 from StarvingMarvin/master d906c4a dir4 test fix 21bdcaf Merge remote-tracking branch 'upstream/master' dee0f4e Disabled checksum check for listing input dir fc4cb0f Added args output and empty.json for null jobs a4950f4 Update tools list 8e1d67c Add Rabix Bunny CI badge 2a5b95e fixing mentions to draft3/4 1356c45 Add test for secondaryFiles with arrays b60125b Single instead of double quotes in doc 179835b Merge pull request common-workflow-language#319 from common-workflow-language/test-cwl-out2 ed40737 Add additional test for cwl.output.json behavior. a217bb6 Merge pull request common-workflow-language#317 from StarvingMarvin/master 8dd69f2 fixing test in v1.0 and v1.1.0-dev1 e831c20 Merge pull request common-workflow-language#314 from common-workflow-language/test-requirements-on-steps 8cad6f1 Add test for requirements/hints on workflow steps. 7679adb Merge pull request common-workflow-language#308 from common-workflow-language/embedded-subworkflow-test 1582677 Tighten up formatting 779c2d4 Add test for embedded subworkflow e22a9c2 Merge pull request common-workflow-language#307 from alaindomissy/patch-3 125cb5f Update UserGuide.yml 99f4f9f Merge pull request common-workflow-language#303 from common-workflow-language/include-stdin-in-docs 5324dbb put stdin shortcut in correct place git-subtree-dir: cwltool/schemas git-subtree-split: aa320ec
1 parent b382e37 commit 65f95a3

35 files changed

+422
-95
lines changed

‎README.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,18 @@ Please cite https://dx.doi.org/10.6084/m9.figshare.3115156.v2
4040

4141
## Implementations
4242

43-
|Software|Description|CWL support|Platform support|Maturity|
43+
|Software|Description|CWL support|Platform support|Platform Maturity|
4444
|--------|-----------|-----------|--------|--------|
4545
|[cwltool](https://github.com/common-workflow-language/cwltool)|Reference implementation of CWL|[![Build Status](https://ci.commonwl.org/job/cwltool-conformance/badge/icon)](http://ci.commonwl.org/job/cwltool-conformance/lastBuild/testReport/)|Linux, OS X, local execution only|Production|
4646
|[Arvados](https://arvados.org)|Distributed computing platform for data analysis on massive data sets. [Using CWL on Arvados](http://doc.arvados.org/user/cwl/cwl-runner.html)|[![Build Status](https://ci.commonwl.org/job/arvados-conformance/badge/icon)](http://ci.commonwl.org/job/arvados-conformance/lastBuild/testReport/)|AWS, GCP, Azure, Slurm|Production|
4747
|[Toil](https://github.com/BD2KGenomics/toil)|Toil is a workflow engine entirely written in Python.|[![Build Status](https://ci.commonwl.org/job/toil-conformance/badge/icon)](http://ci.commonwl.org/job/toil-conformance/lastBuild/testReport/)|AWS, GCP, Azure, OpenStack, Grid Engine, Mesos|Production|
48+
|[Rabix Bunny](https://github.com/rabix/bunny)|Reproducible Analyses for Bioinformatics|[![Build Status](https://ci.commonwl.org/buildStatus/icon?job=rabix-conformance)](https://ci.commonwl.org/job/rabix-conformance/)|Java|alpha|
4849
|[Apache Taverna](http://taverna.incubator.apache.org/)|Domain-independent Workflow Management System|[alpha](https://issues.apache.org/jira/browse/TAVERNA-900)|Java|Production|
4950
|[Galaxy](https://galaxyproject.org/)|Web-based platform for data intensive biomedical research.|[alpha](https://github.com/common-workflow-language/galaxy)|Python|Production|
5051
|[AWE](https://github.com/MG-RAST/AWE)|Workflow and resource management system for bioinformatics data analysis.|[alpha](https://github.com/wgerlach/AWE)|Go|Production|
5152
|[Funnel](https://github.com/bmeg/funnel)|Use Google Genomics Pipeline API with CWL|alpha|GCP|alpha|
52-
|[Rabix Bunny](https://github.com/rabix/bunny)|Reproducible Analyses for Bioinformatics|alpha|Java|alpha|
53+
|[xenon-cwl-runner](https://github.com/NLeSC/xenon-cwl-runner)|Run CWL workflows using Xenon|alpha|[any Xenon backend](http://nlesc.github.io/Xenon/): local, ssh, SLURM, Torque, Grid Engine|Production|
54+
5355

5456
## Repositories of CWL Tools and Workflows
5557

@@ -64,10 +66,12 @@ Please cite https://dx.doi.org/10.6084/m9.figshare.3115156.v2
6466
|--------|-----------|
6567
|[cwltest](https://github.com/common-workflow-language/cwltest)|CWL testing framework, automated testing of tools and workflows written with CWL|
6668
|[cwl-upgrader](https://github.com/common-workflow-language/cwl-upgrader)|Upgrade CWL documents from draft-3 to v1.0|
67-
|[argparse2cwl](https://github.com/common-workflow-language/gxargparse#argparse2cwl)|Generate CWL CommandLineTool wrapper from Python programs that use argparse. Also supports [click](http://click.pocoo.org/5/) argument parser.|
69+
|[argparse2tool](https://github.com/erasche/argparse2tool#cwl-specific-functionality)|Generate CWL CommandLineTool wrappers (and/or Galaxy tool descriptions) from Python programs that use argparse. Also supports the [click](http://click.pocoo.org/5/) argument parser.|
6870
|[cwl2argparse](https://github.com/common-workflow-language/cwl2argparse)|Generate Python argparse code from CWL CommandLineTool description.|
6971
|[pypi2cwl](https://github.com/common-workflow-language/pypi2cwl)|Automatically run argparse2cwl on any package in PyPi|
7072
|[cwlavro](https://github.com/common-workflow-language/cwlavro)|Java classes for loading CWL documents|
73+
|[acd2cwl](https://github.com/common-workflow-language/acd2cwl)|CWL generator for ACD (EMBOSS) files |
74+
|[CWLviewer](https://github.com/MarkRobbo/CWLViewer)|A web application to view and share Common Workflow Language workflows|
7175

7276
## Support, Community and Contributing
7377

‎draft-2/draft-2/binding-test.cwl

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ inputs:
2222
inputBinding:
2323
position: -1
2424

25-
outputs: []
25+
outputs:
26+
- id: "#args"
27+
type:
28+
type: array
29+
items: string
2630

2731
baseCommand: python
2832
arguments: ["bwa", "mem"]

‎draft-2/draft-2/cat1-testcli.cwl

+16-10
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,24 @@
1717
}
1818
},
1919
{
20-
id: "#args.py",
21-
type: File,
22-
default: {
23-
class: File,
24-
path: args.py
25-
},
26-
inputBinding: {
27-
position: -1
28-
}
20+
"id": "#args.py",
21+
"type": "File",
22+
"default": {
23+
"class": "File",
24+
"path": "args.py"
25+
},
26+
"inputBinding": {
27+
"position": -1
28+
}
2929
}
3030
],
31-
"outputs": [],
31+
"outputs": [{
32+
"id": "#args",
33+
"type": {
34+
"type": "array",
35+
"items": "string"
36+
}
37+
}],
3238
"baseCommand": "python",
3339
"arguments": ["cat"]
3440
}

‎draft-2/draft-2/tmap-tool.cwl

+14-7
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
}
1919
},
2020
{
21-
id: "#args.py",
22-
type: File,
23-
default: {
24-
class: File,
25-
path: args.py
21+
"id": "#args.py",
22+
"type": "File",
23+
"default": {
24+
"class": "File",
25+
"path": "args.py"
2626
},
27-
inputBinding: {
28-
position: -1
27+
"inputBinding": {
28+
"position": -1
2929
}
3030
}
3131
],
@@ -36,6 +36,13 @@
3636
"glob": "output.sam"
3737
},
3838
"type": ["null", "File"]
39+
},
40+
{
41+
"id": "#args",
42+
"type": {
43+
"type": "array",
44+
"items": "string"
45+
}
3946
}
4047
],
4148
"requirements": [

‎draft-3/draft-3/binding-test.cwl

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ inputs:
2323
inputBinding:
2424
position: -1
2525

26-
outputs: []
26+
outputs:
27+
- id: args
28+
type:
29+
type: array
30+
items: string
2731

2832
baseCommand: python
2933
arguments: ["bwa", "mem"]

‎draft-3/draft-3/cat1-testcli.cwl

+14-8
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,24 @@
1818
}
1919
},
2020
{
21-
id: "args.py",
22-
type: File,
23-
default: {
24-
class: File,
25-
path: args.py
21+
"id": "args.py",
22+
"type": "File",
23+
"default": {
24+
"class": "File",
25+
"path": "args.py"
2626
},
27-
inputBinding: {
28-
position: -1
27+
"inputBinding": {
28+
"position": -1
2929
}
3030
}
3131
],
32-
"outputs": [],
32+
"outputs": [{
33+
"id": "args",
34+
"type": {
35+
"type": "array",
36+
"items": "string"
37+
}
38+
}],
3339
"baseCommand": "python",
3440
"arguments": ["cat"]
3541
}

‎draft-3/draft-3/tmap-tool.cwl

+16-9
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
}
2121
},
2222
{
23-
id: "#args.py",
24-
type: File,
25-
default: {
26-
class: File,
27-
path: args.py
28-
},
29-
inputBinding: {
30-
position: -1
31-
}
23+
"id": "#args.py",
24+
"type": "File",
25+
"default": {
26+
"class": "File",
27+
"path": "args.py"
28+
},
29+
"inputBinding": {
30+
"position": -1
31+
}
3232
}
3333
],
3434
"outputs": [
@@ -38,6 +38,13 @@
3838
"glob": "output.sam"
3939
},
4040
"type": ["null", "File"]
41+
},
42+
{
43+
"id": "args",
44+
"type": {
45+
"type": "array",
46+
"items": "string"
47+
}
4148
}
4249
],
4350
"requirements": [

‎v1.0/CommandLineTool.yml

-1
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,6 @@ $graph:
694694
- name: package
695695
type: string
696696
doc: "The common name of the software to be configured."
697-
jsonldPredicate: "@id"
698697
- name: version
699698
type: string[]?
700699
doc: "The (optional) version of the software to configured."

‎v1.0/UserGuide.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@
290290
- |
291291
## Parameter references
292292
293-
In a previous example, we used extracted a file using the "tar" program.
294-
However, that example was very limited becuase it assumed that the file
293+
In a previous example, we extracted a file using the "tar" program.
294+
However, that example was very limited because it assumed that the file
295295
we were interested in was called "hello.txt". In this example, you will
296296
see how to reference the value of input parameters dynamically from other
297297
fields.

‎v1.0/concepts.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ preprocessing steps described in the
8989
[Semantic Annotations for Linked Avro Data (SALAD) Specification](SchemaSalad.html).
9090
An implementation may formally validate the structure of a CWL document using
9191
SALAD schemas located at
92-
https://github.com/common-workflow-language/common-workflow-language/tree/master/draft-4
92+
https://github.com/common-workflow-language/common-workflow-language/tree/master/v1.0
9393

9494
## Identifiers
9595

‎v1.0/conformance_test_v1.0.yaml

+97-9
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
output_file:
6464
class: File
6565
checksum: sha1$47a013e660d408619d894b20806b1d5086aab03b
66-
location:
66+
location: Any
6767
size: 13
6868
doc: Test command execution in Docker with simplified syntax stdout redirection
6969

@@ -77,7 +77,7 @@
7777
tool: v1.0/cat3-tool-mediumcut.cwl
7878
doc: Test command execution in Docker with stdout redirection
7979

80-
- job:
80+
- job: v1.0/empty.json
8181
tool: v1.0/egrep-stderr.cwl
8282
doc: Test command line with stderr redirection
8383
output:
@@ -87,7 +87,7 @@
8787
size: 84
8888
location: error.txt
8989

90-
- job:
90+
- job: v1.0/empty.json
9191
tool: v1.0/egrep-stderr-shortcut.cwl
9292
doc: Test command line with stderr redirection, brief syntax
9393
output:
@@ -103,7 +103,7 @@
103103
size: 84
104104
checksum: sha1$cec7b8746a78c42060c96505887449bca0142976
105105
location: std.err
106-
job:
106+
job: v1.0/empty.json
107107
tool: v1.0/egrep-stderr-mediumcut.cwl
108108
doc: Test command line with stderr redirection, named brief syntax
109109

@@ -287,6 +287,16 @@
287287
tool: v1.0/env-wf2.cwl
288288
doc: Test requirements override hints
289289

290+
- job: v1.0/env-job.json
291+
output:
292+
out:
293+
class: File
294+
checksum: sha1$cdc1e84968261d6a7575b5305945471f8be199b6
295+
location: out
296+
size: 9
297+
tool: v1.0/env-wf3.cwl
298+
doc: Test requirements on workflow steps
299+
290300
- job: v1.0/empty.json
291301
output: {count_output: 16}
292302
tool: v1.0/count-lines9-wf.cwl
@@ -649,7 +659,23 @@
649659
}
650660
}
651661
tool: v1.0/test-cwl-out.cwl
652-
doc: Test support for reading cwl.output.json when running in Docker container
662+
doc: |
663+
Test support for reading cwl.output.json when running in a Docker container
664+
and just 'path' is provided.
665+
666+
- job: v1.0/empty.json
667+
output: {
668+
"foo": {
669+
"location": "foo",
670+
"class": "File",
671+
"checksum": "sha1$f1d2d2f924e986ac86fdf7b36c94bcdf32beec15",
672+
"size": 4
673+
}
674+
}
675+
tool: v1.0/test-cwl-out2.cwl
676+
doc: |
677+
Test support for reading cwl.output.json when running in a Docker container
678+
and just 'location' is provided.
653679
654680
- job: v1.0/abc.json
655681
output:
@@ -763,10 +789,10 @@
763789
- job: v1.0/dir4-job.yml
764790
output: {
765791
"outlist": {
766-
"checksum": "sha1$2ab6f189e84753c05a23413fbf6b6fbf4c53489f",
767-
"size": 90,
768-
"location": "output.txt",
769-
"class": "File"
792+
"checksum": "sha1$13cda8661796ae241da3a18668fb552161a72592",
793+
"size": 20,
794+
"location": "output.txt",
795+
"class": "File"
770796
}
771797
}
772798
tool: v1.0/dir4.cwl
@@ -883,3 +909,65 @@
883909
"size": 12010
884910
tool: v1.0/initialworkdirrequirement-docker-out.cwl
885911
doc: Test output of InitialWorkDir
912+
913+
- job: v1.0/wc-job.json
914+
output: {count_output: 16}
915+
tool: v1.0/count-lines10-wf.cwl
916+
doc: Test embedded subworkflow
917+
918+
- job: v1.0/docker-array-secondaryfiles-job.json
919+
output: {
920+
"bai_list": {
921+
"checksum": "sha1$081fc0e57d6efa5f75eeb237aab1d04031132be6",
922+
"location": "fai.list",
923+
"class": "File",
924+
"size": 386
925+
}
926+
}
927+
tool: v1.0/docker-array-secondaryfiles.cwl
928+
doc: Test secondaryFiles on array of files.
929+
930+
- job: v1.0/dir7.yml
931+
output: {
932+
"dir": {
933+
"location": "a_directory",
934+
"class": "Directory",
935+
"listing": [
936+
{
937+
"class": "File",
938+
"location": "whale.txt",
939+
"checksum": "sha1$327fc7aedf4f6b69a42a7c8b808dc5a7aff61376",
940+
"size": 1111
941+
},
942+
{
943+
"class": "File",
944+
"location": "hello.txt",
945+
"checksum": "sha1$47a013e660d408619d894b20806b1d5086aab03b",
946+
"size": 13
947+
}
948+
]
949+
}
950+
}
951+
tool: v1.0/dir7.cwl
952+
doc: Test directory literal output created by ExpressionTool
953+
954+
- job: v1.0/empty.json
955+
output:
956+
lit:
957+
location: "a_file"
958+
class: "File"
959+
checksum: "sha1$fea23663b9c8ed71968f86415b5ec091bb111448"
960+
size: 19
961+
tool: v1.0/file-literal-ex.cwl
962+
doc: Test file literal output created by ExpressionTool
963+
964+
- job: v1.0/empty.json
965+
output:
966+
"thing": {
967+
"checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
968+
"location": "thing",
969+
"class": "File",
970+
"size": 0
971+
}
972+
tool: v1.0/docker-output-dir.cwl
973+
doc: Test dockerOutputDirectory

‎v1.0/salad/README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,6 @@ provides for robust support of inline documentation.
7070
.. _JSON-LD: http://json-ld.org
7171
.. _Avro: http://avro.apache.org
7272
.. _metaschema: https://github.com/common-workflow-language/schema_salad/blob/master/schema_salad/metaschema/metaschema.yml
73-
.. _specification: http://www.commonwl.org/draft-3/SchemaSalad.html
74-
.. _Language: https://github.com/common-workflow-language/common-workflow-language/blob/master/draft-3/CommandLineTool.yml
73+
.. _specification: http://www.commonwl.org/v1.0/SchemaSalad.html
74+
.. _Language: https://github.com/common-workflow-language/common-workflow-language/blob/master/v1.0/CommandLineTool.yml
7575
.. _RDF: https://www.w3.org/RDF/

0 commit comments

Comments
 (0)