Skip to content

Commit aa44386

Browse files
authored
Merge pull request #400 from common-workflow-language/v1.1.0-dev1
Sync v1.1 conformance test suite to changes in v1.0 suite.
2 parents a90334a + e6dc6e4 commit aa44386

37 files changed

+423
-104
lines changed

v1.0/conformance_test_v1.0.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -78,33 +78,33 @@
7878
doc: Test command execution in Docker with stdout redirection
7979

8080
- job: v1.0/empty.json
81-
tool: v1.0/egrep-stderr.cwl
81+
tool: v1.0/stderr.cwl
8282
doc: Test command line with stderr redirection
8383
output:
8484
output_file:
8585
class: File
86-
checksum: sha1$cec7b8746a78c42060c96505887449bca0142976
87-
size: 84
86+
checksum: sha1$f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
87+
size: 4
8888
location: error.txt
8989

9090
- job: v1.0/empty.json
91-
tool: v1.0/egrep-stderr-shortcut.cwl
91+
tool: v1.0/stderr-shortcut.cwl
9292
doc: Test command line with stderr redirection, brief syntax
9393
output:
9494
output_file:
9595
class: File
96-
checksum: sha1$cec7b8746a78c42060c96505887449bca0142976
97-
size: 84
96+
checksum: sha1$f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
97+
size: 4
9898
location: Any
9999

100100
- output:
101101
output_file:
102102
class: File
103-
size: 84
104-
checksum: sha1$cec7b8746a78c42060c96505887449bca0142976
103+
size: 4
104+
checksum: sha1$f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
105105
location: std.err
106106
job: v1.0/empty.json
107-
tool: v1.0/egrep-stderr-mediumcut.cwl
107+
tool: v1.0/stderr-mediumcut.cwl
108108
doc: Test command line with stderr redirection, named brief syntax
109109

110110
- job: v1.0/cat-job.json

v1.0/v1.0/egrep-stderr-mediumcut.cwl renamed to v1.0/v1.0/stderr-mediumcut.cwl

+4-9
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@
22
class: CommandLineTool
33
cwlVersion: v1.0
44
doc: "Test of capturing stderr output in a docker container."
5-
hints:
6-
DockerRequirement:
7-
dockerPull: debian:wheezy
8-
5+
requirements:
6+
ShellCommandRequirement: {}
97
inputs: []
10-
118
outputs:
129
output_file:
1310
type: stderr
14-
15-
baseCommand: egrep
16-
successCodes: [2]
17-
11+
arguments:
12+
- { valueFrom: "echo foo 1>&2", shellQuote: False }
1813
stderr: std.err

v1.0/v1.0/egrep-stderr-shortcut.cwl renamed to v1.0/v1.0/stderr-shortcut.cwl

+4-8
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22
class: CommandLineTool
33
cwlVersion: v1.0
44
doc: "Test of capturing stderr output in a docker container."
5-
hints:
6-
DockerRequirement:
7-
dockerPull: debian:wheezy
8-
5+
requirements:
6+
ShellCommandRequirement: {}
97
inputs: []
10-
118
outputs:
129
output_file:
1310
type: stderr
14-
15-
baseCommand: egrep
16-
successCodes: [2]
11+
arguments:
12+
- { valueFrom: "echo foo 1>&2", shellQuote: False }

v1.0/v1.0/egrep-stderr.cwl renamed to v1.0/v1.0/stderr.cwl

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
class: CommandLineTool
33
cwlVersion: v1.0
44
doc: "Test of capturing stderr output in a docker container."
5-
hints:
6-
DockerRequirement:
7-
dockerPull: debian:wheezy
5+
requirements:
6+
ShellCommandRequirement: {}
87
inputs: []
98
outputs:
109
output_file:
1110
type: File
1211
outputBinding: {glob: error.txt}
13-
baseCommand: egrep
14-
successCodes: [2]
12+
arguments:
13+
- { valueFrom: "echo foo 1>&2", shellQuote: False }
1514
stderr: error.txt

v1.1.0-dev1/CommandLineTool.yml

-1
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,6 @@ $graph:
747747
- name: package
748748
type: string
749749
doc: "The common name of the software to be configured."
750-
jsonldPredicate: "@id"
751750
- name: version
752751
type: string[]?
753752
doc: "The (optional) version of the software to configured."

v1.1.0-dev1/Process.yml

-1
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,6 @@ $graph:
595595
doc: |
596596
Specify valid types of data that may be assigned to this parameter.
597597
598-
599598
- name: OutputParameter
600599
type: record
601600
extends: Parameter

v1.1.0-dev1/UserGuide.yml

+18-8
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
184184
The value of `position` is used to determine where parameter should
185185
appear on the command line. Positions are relative to one another, not
186-
abosolute. As a result, positions do not have to be sequential, three
186+
absolute. As a result, positions do not have to be sequential, three
187187
parameters with positions `[1, 3, 5]` will result in the same command
188188
line as `[1, 2, 3]`. More than one parameter can have the same position
189189
(ties are broken using the parameter name), and the position field itself
@@ -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.
@@ -356,7 +356,7 @@
356356
containers are also purposefully isolated from the host system, so in
357357
order to run a tool inside a Docker container there is additional work to
358358
ensure that input files are available inside the container and output
359-
files can be recovered from the contianer. CWL can perform this work
359+
files can be recovered from the container. CWL can perform this work
360360
automatically, allowing you to use Docker to simplify your software
361361
management while avoiding the complexity of invoking and managing Docker
362362
containers.
@@ -466,7 +466,7 @@
466466
tool is actually executed. The `$(runtime.outdir)` parameter is the path
467467
to the designated output directory. Other parameters include
468468
`$(runtime.tmpdir)`, `$(runtime.ram)`, `$(runtime.cores)`,
469-
`$(runtime.ram)`, `$(runtime.outdirSize)`, and `$(runtime.tmpdirSize)`. See
469+
`$(runtime.outdirSize)`, and `$(runtime.tmpdirSize)`. See
470470
the [Runtime Environment](CommandLineTool.html#Runtime_environment)
471471
section of the CWL specification for details.
472472
@@ -522,7 +522,7 @@
522522
- |
523523
```
524524
525-
*array-outpust-job.yml*
525+
*array-outputs-job.yml*
526526
```
527527
- $include: examples/array-outputs-job.yml
528528
- |
@@ -662,6 +662,16 @@
662662
- |
663663
```
664664
665+
As this tool does not require any `inputs` we can run it with an (almost) empty job file:
666+
667+
*empty.yml*
668+
```
669+
{}
670+
|
671+
```
672+
673+
We can then run `expression.cwl`:
674+
665675
```
666676
$ cwl-runner expression.cwl empty.yml
667677
[job 140000594593168] /home/example$ echo -A 2 -B baz -C 10 9 8 7 6 5 4 3 2 1
@@ -796,7 +806,7 @@
796806
class: Workflow
797807
```
798808
799-
The 'cwlVersion` field indicates the version of the CWL spec used by the
809+
The `cwlVersion` field indicates the version of the CWL spec used by the
800810
document. The `class` field indicates this document describes a workflow.
801811
802812
@@ -820,7 +830,7 @@
820830
821831
The `outputs` section describes the outputs of the workflow. This is a
822832
list of output parameters where each parameter consists of an identifier
823-
and a data type. The `source` connects the output parameter `classfile`
833+
and a data type. The `outputSource` connects the output parameter `classfile`
824834
of the `compile` step to the workflow output parameter `classout`.
825835
826836
```

v1.1.0-dev1/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.1.0-dev1
9393

9494
## Identifiers
9595

0 commit comments

Comments
 (0)