Skip to content

Commit 3c40bd3

Browse files
authored
Merge pull request #250 from common-workflow-language/draft-4-to-v1.0
Draft 4 to v1.0
2 parents ce19b18 + b4de02d commit 3c40bd3

File tree

280 files changed

+78
-76
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

280 files changed

+78
-76
lines changed
File renamed without changes.
File renamed without changes.

draft-4/Process.yml renamed to v1.0/Process.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ $graph:
3434
- cwl:draft-4.dev1
3535
- cwl:draft-4.dev2
3636
- cwl:draft-4.dev3
37+
- cwl:v1.0.dev4
3738

3839
- name: CWLType
3940
type: enum
@@ -690,9 +691,10 @@ $graph:
690691
jsonldPredicate: "rdfs:comment"
691692
doc: "A long, human-readable description of this process object."
692693
- name: cwlVersion
693-
type:
694-
- CWLVersions
695-
doc: "CWL document version"
694+
type: CWLVersions?
695+
doc: |
696+
CWL document version. Always required at the document root. Not
697+
required for a Process embedded inside another Process.
696698
jsonldPredicate:
697699
"_id": "cwl:cwlVersion"
698700
"_type": "@vocab"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

draft-4/draft-4/binding-test.cwl renamed to v1.0/draft-4/binding-test.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env cwl-runner
22

33
class: CommandLineTool
4-
cwlVersion: cwl:draft-4.dev3
4+
cwlVersion: v1.0.dev4
55

66
inputs:
77
- id: reference
File renamed without changes.

draft-4/draft-4/bwa-mem-tool.cwl renamed to v1.0/draft-4/bwa-mem-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22

3-
cwlVersion: draft-4.dev3
3+
cwlVersion: v1.0.dev4
44

55
class: CommandLineTool
66

File renamed without changes.
File renamed without changes.

draft-4/draft-4/cat1-testcli.cwl renamed to v1.0/draft-4/cat1-testcli.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env cwl-runner
22
{
33
"class": "CommandLineTool",
4-
"cwlVersion": "cwl:draft-4.dev3",
4+
"cwlVersion": "v1.0.dev4",
55
"description": "Print the contents of a file to stdout using 'cat' running in a docker container.",
66
"inputs": [
77
{

draft-4/draft-4/cat1-tool.cwl renamed to v1.0/draft-4/cat1-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env cwl-runner
2-
cwlVersion: cwl:draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
class: CommandLineTool
44
description: "Print the contents of a file to stdout using 'cat' running in a docker container."
55
hints:

draft-4/draft-4/cat2-tool.cwl renamed to v1.0/draft-4/cat2-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: CommandLineTool
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44
description: "Print the contents of a file to stdout using 'cat' running in a docker container."
55
hints:
66
DockerRequirement:

draft-4/draft-4/cat3-tool-mediumcut.cwl renamed to v1.0/draft-4/cat3-tool-mediumcut.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: CommandLineTool
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44
description: "Print the contents of a file to stdout using 'cat' running in a docker container."
55
hints:
66
DockerRequirement:

draft-4/draft-4/cat3-tool-shortcut.cwl renamed to v1.0/draft-4/cat3-tool-shortcut.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: CommandLineTool
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44
description: "Print the contents of a file to stdout using 'cat' running in a docker container."
55
hints:
66
DockerRequirement:

draft-4/draft-4/cat3-tool.cwl renamed to v1.0/draft-4/cat3-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: CommandLineTool
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44
description: "Print the contents of a file to stdout using 'cat' running in a docker container."
55
hints:
66
DockerRequirement:

draft-4/draft-4/cat4-tool.cwl renamed to v1.0/draft-4/cat4-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: CommandLineTool
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44
description: "Print the contents of a file to stdout using 'cat' running in a docker container."
55
hints:
66
DockerRequirement:

draft-4/draft-4/cat5-tool.cwl renamed to v1.0/draft-4/cat5-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env cwl-runner
2-
cwlVersion: cwl:draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
class: CommandLineTool
44
description: "Print the contents of a file to stdout using 'cat' running in a docker container."
55
hints:
File renamed without changes.
File renamed without changes.

draft-4/draft-4/conflict-wf.cwl renamed to v1.0/draft-4/conflict-wf.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cwlVersion: cwl:draft-4.dev3
1+
cwlVersion: v1.0.dev4
22
$graph:
33
- id: echo
44
class: CommandLineTool

draft-4/draft-4/count-lines1-wf.cwl renamed to v1.0/draft-4/count-lines1-wf.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: Workflow
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44

55
inputs:
66
file1:

draft-4/draft-4/count-lines2-wf.cwl renamed to v1.0/draft-4/count-lines2-wf.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: Workflow
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44
requirements:
55
InlineJavascriptRequirement: {}
66

draft-4/draft-4/count-lines3-wf.cwl renamed to v1.0/draft-4/count-lines3-wf.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: Workflow
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44

55
inputs:
66
file1:

draft-4/draft-4/count-lines4-wf.cwl renamed to v1.0/draft-4/count-lines4-wf.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: Workflow
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44

55
inputs:
66
file1:

draft-4/draft-4/count-lines5-wf.cwl renamed to v1.0/draft-4/count-lines5-wf.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: Workflow
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44

55
inputs:
66
file1:

draft-4/draft-4/count-lines6-wf.cwl renamed to v1.0/draft-4/count-lines6-wf.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: Workflow
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44

55
inputs:
66
file1: File[]

draft-4/draft-4/count-lines7-wf.cwl renamed to v1.0/draft-4/count-lines7-wf.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: Workflow
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44

55
requirements:
66
- class: MultipleInputFeatureRequirement

draft-4/draft-4/count-lines8-wf.cwl renamed to v1.0/draft-4/count-lines8-wf.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: Workflow
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44

55
inputs:
66
file1: File

draft-4/draft-4/count-lines9-wf.cwl renamed to v1.0/draft-4/count-lines9-wf.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: Workflow
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44

55
inputs: []
66

File renamed without changes.
File renamed without changes.

draft-4/draft-4/dir.cwl renamed to v1.0/draft-4/dir.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: CommandLineTool
2-
cwlVersion: draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
requirements:
44
- class: ShellCommandRequirement
55
inputs:

draft-4/draft-4/dir2.cwl renamed to v1.0/draft-4/dir2.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: CommandLineTool
2-
cwlVersion: draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
hints:
44
DockerRequirement:
55
dockerPull: debian:8
File renamed without changes.

draft-4/draft-4/dir3.cwl renamed to v1.0/draft-4/dir3.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: CommandLineTool
2-
cwlVersion: draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
baseCommand: [tar, xvf]
44
inputs:
55
inf:
File renamed without changes.

draft-4/draft-4/dir4.cwl renamed to v1.0/draft-4/dir4.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: CommandLineTool
2-
cwlVersion: draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
requirements:
44
- class: ShellCommandRequirement
55
inputs:

draft-4/draft-4/dir5.cwl renamed to v1.0/draft-4/dir5.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: CommandLineTool
2-
cwlVersion: draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
requirements:
44
- class: ShellCommandRequirement
55
- class: InitialWorkDirRequirement

draft-4/draft-4/echo-tool.cwl renamed to v1.0/draft-4/echo-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env cwl-runner
22

33
class: CommandLineTool
4-
cwlVersion: cwl:draft-4.dev3
4+
cwlVersion: v1.0.dev4
55
inputs:
66
in:
77
type: Any

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: CommandLineTool
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44
description: "Test of capturing stderr output in a docker container."
55
hints:
66
DockerRequirement:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: CommandLineTool
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44
description: "Test of capturing stderr output in a docker container."
55
hints:
66
DockerRequirement:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: CommandLineTool
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44
description: "Test of capturing stderr output in a docker container."
55
hints:
66
DockerRequirement:
File renamed without changes.
File renamed without changes.

draft-4/draft-4/env-tool1.cwl renamed to v1.0/draft-4/env-tool1.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: CommandLineTool
2-
cwlVersion: cwl:draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
inputs:
44
in: string
55
outputs:

draft-4/draft-4/env-tool2.cwl renamed to v1.0/draft-4/env-tool2.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: CommandLineTool
2-
cwlVersion: cwl:draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
inputs:
44
in: string
55
outputs:

draft-4/draft-4/env-wf1.cwl renamed to v1.0/draft-4/env-wf1.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: Workflow
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44

55
inputs:
66
in: string

draft-4/draft-4/env-wf2.cwl renamed to v1.0/draft-4/env-wf2.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: Workflow
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44

55
inputs:
66
in: string
File renamed without changes.
File renamed without changes.

draft-4/draft-4/formattest.cwl renamed to v1.0/draft-4/formattest.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$namespaces:
22
edam: "http://edamontology.org/"
3-
cwlVersion: cwl:draft-4.dev3
3+
cwlVersion: v1.0.dev4
44
class: CommandLineTool
55
description: "Reverse each line using the `rev` command"
66
inputs:

draft-4/draft-4/formattest2.cwl renamed to v1.0/draft-4/formattest2.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ $namespaces:
33
$schemas:
44
- EDAM.owl
55
class: CommandLineTool
6-
cwlVersion: cwl:draft-4.dev3
6+
cwlVersion: v1.0.dev4
77
description: "Reverse each line using the `rev` command"
88

99
inputs:

draft-4/draft-4/formattest3.cwl renamed to v1.0/draft-4/formattest3.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $schemas:
55
- EDAM.owl
66
- gx_edam.ttl
77
class: CommandLineTool
8-
cwlVersion: cwl:draft-4.dev3
8+
cwlVersion: v1.0.dev4
99
description: "Reverse each line using the `rev` command"
1010

1111
inputs:

draft-4/draft-4/glob-expr-list.cwl renamed to v1.0/draft-4/glob-expr-list.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: CommandLineTool
2-
cwlVersion: cwl:draft-4.dev3
2+
cwlVersion: v1.0.dev4
33

44
inputs:
55
ids:
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

draft-4/draft-4/metadata.cwl renamed to v1.0/draft-4/metadata.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $schemas:
66
- foaf.rdf
77
- dcterms.rdf
88

9-
cwlVersion: cwl:draft-4.dev3
9+
cwlVersion: v1.0.dev4
1010
class: CommandLineTool
1111
description: "Print the contents of a file to stdout using 'cat' running in a docker container."
1212

draft-4/draft-4/null-expression1-tool.cwl renamed to v1.0/draft-4/null-expression1-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
class: ExpressionTool
44
requirements:
55
- class: InlineJavascriptRequirement
6-
cwlVersion: cwl:draft-4.dev3
6+
cwlVersion: v1.0.dev4
77

88
inputs:
99
i1:

draft-4/draft-4/null-expression2-tool.cwl renamed to v1.0/draft-4/null-expression2-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
class: ExpressionTool
44
requirements:
55
- class: InlineJavascriptRequirement
6-
cwlVersion: cwl:draft-4.dev3
6+
cwlVersion: v1.0.dev4
77

88
inputs:
99
i1: Any
File renamed without changes.

draft-4/draft-4/optional-output.cwl renamed to v1.0/draft-4/optional-output.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env cwl-runner
22
class: CommandLineTool
3-
cwlVersion: "cwl:draft-4.dev3"
3+
cwlVersion: "v1.0.dev4"
44
description: "Print the contents of a file to stdout using 'cat' running in a docker container."
55
hints:
66
DockerRequirement:

draft-4/draft-4/params.cwl renamed to v1.0/draft-4/params.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: CommandLineTool
2-
cwlVersion: cwl:draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
inputs:
44
bar:
55
type: Any

draft-4/draft-4/params2.cwl renamed to v1.0/draft-4/params2.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: CommandLineTool
2-
cwlVersion: cwl:draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
requirements:
44
- class: InlineJavascriptRequirement
55

File renamed without changes.
File renamed without changes.

draft-4/draft-4/parseInt-tool.cwl renamed to v1.0/draft-4/parseInt-tool.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
class: ExpressionTool
44
requirements:
55
- class: InlineJavascriptRequirement
6-
cwlVersion: cwl:draft-4.dev3
6+
cwlVersion: v1.0.dev4
77

88
inputs:
99
file1:
File renamed without changes.

draft-4/draft-4/record-output.cwl renamed to v1.0/draft-4/record-output.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: CommandLineTool
2-
cwlVersion: cwl:draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
requirements:
44
- class: ShellCommandRequirement
55
inputs:
File renamed without changes.
File renamed without changes.

draft-4/draft-4/rename.cwl renamed to v1.0/draft-4/rename.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: CommandLineTool
2-
cwlVersion: cwl:draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
baseCommand: "true"
44
requirements:
55
InitialWorkDirRequirement:
File renamed without changes.

draft-4/draft-4/revsort.cwl renamed to v1.0/draft-4/revsort.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
class: Workflow
55
description: "Reverse the lines in a document, then sort those lines."
6-
cwlVersion: cwl:draft-4.dev3
6+
cwlVersion: v1.0.dev4
77

88
# Requirements & hints specify prerequisites and extensions to the workflow.
99
# In this example, DockerRequirement specifies a default Docker container

0 commit comments

Comments
 (0)