Skip to content

Commit 063daf0

Browse files
author
Peter Amstutz
committed
Squashed 'cwltool/schemas/' changes from 3c40bd3..2ec0b1b
2ec0b1b Update tests. Add 'doc' field to Parameter because it doesn't inherit from salad Record. b3d54b7 Merge commit '06f410c331c88bfe750eb2d0e5b75d5b8b42dea8' as 'v1.0/salad' 06f410c Squashed 'v1.0/salad/' content from commit 13061e5 16e8f78 re-import schema salad a0ae6d3 Add label to SchemaBase 1299053 add label to CWL record c0de1ab for v1.0 rename description to doc 0c3e2c5 Merge pull request #251 from common-workflow-language/maya-edits 599c6e1 clarify basename path splitting c77c3f0 edits from maya 0ce6696 change draft?4 to v1.0 in the docs afe95d8 rename paths in v1.0 conformance tests 2763fb6 update site generation to v1.0 23c1151 Update SoftwareRequirement spec based on codefest discussion. git-subtree-dir: cwltool/schemas git-subtree-split: 2ec0b1b
1 parent 8595405 commit 063daf0

File tree

156 files changed

+475
-347
lines changed

Some content is hidden

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

156 files changed

+475
-347
lines changed

‎README.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,11 @@ provides a gentle introduction to writing CWL command line tool and workflow des
2121

2222
## CWL Specification
2323

24-
The current stable specification is [draft 3](http://www.commonwl.org/draft-3/):
24+
The current stable specification is [v1.0](http://www.commonwl.org/v1.0/):
2525

26-
http://www.commonwl.org/draft-3/
26+
http://www.commonwl.org/draft-v1.0/
2727

28-
The next work-in-progress specification is [draft 4](http://www.commonwl.org/draft-4/):
29-
30-
http://www.commonwl.org/draft-4/
31-
32-
Older drafts: [draft-1](https://github.com/common-workflow-language/common-workflow-language/tree/master/draft-1), [draft-2](http://www.commonwl.org/draft-2/)
28+
Older drafts: [draft-1](https://github.com/common-workflow-language/common-workflow-language/tree/master/draft-1), [draft-2](http://www.commonwl.org/draft-2/), [draft-3](http://www.commonwl.org/draft-3/)
3329

3430
### Citation
3531

‎site/cwlsite-draft4-job.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[{
22
"source": {
33
"class": "File",
4-
"path": "../draft-4/README.md"
4+
"path": "../v1.0/README.md"
55
},
6-
"target": "draft-4/index.html",
6+
"target": "v1.0/index.html",
77
"renderlist": [],
88
"redirect": [],
99
"brandlink": "../index.html",
@@ -13,10 +13,10 @@
1313
{
1414
"source": {
1515
"class": "File",
16-
"path": "../draft-4/CommandLineTool-standalone.yml",
16+
"path": "../v1.0/CommandLineTool-standalone.yml",
1717
"secondaryFiles": {"$import": "draft4-deps.json"}
1818
},
19-
"target": "draft-4/CommandLineTool.html",
19+
"target": "v1.0/CommandLineTool.html",
2020
"renderlist": [
2121
"https://w3id.org/cwl/cwl#CommandLineToolDoc",
2222
"https://w3id.org/cwl/cwl#CommandLineTool"
@@ -29,10 +29,10 @@
2929
{
3030
"source": {
3131
"class": "File",
32-
"path": "../draft-4/CommonWorkflowLanguage.yml",
32+
"path": "../v1.0/CommonWorkflowLanguage.yml",
3333
"secondaryFiles": {"$import": "draft4-deps.json"}
3434
},
35-
"target": "draft-4/Workflow.html",
35+
"target": "v1.0/Workflow.html",
3636
"renderlist": [
3737
"https://w3id.org/cwl/cwl#WorkflowDoc",
3838
"https://w3id.org/cwl/cwl#Workflow"
@@ -51,7 +51,7 @@
5151
},
5252
{
5353
"source": {$import: draft4-metaschema.json},
54-
"target": "draft-4/SchemaSalad.html",
54+
"target": "v1.0/SchemaSalad.html",
5555
"renderlist": [
5656
"https://w3id.org/cwl/salad#Semantic_Annotations_for_Linked_Avro_Data",
5757
"https://w3id.org/cwl/salad#SaladRecordSchema",
@@ -65,7 +65,7 @@
6565
},
6666
#{
6767
# "source": {"$import": "userguide-draft4-input.json"},
68-
# "target": "draft-4/UserGuide.html",
68+
# "target": "v1.0/UserGuide.html",
6969
# "renderlist": [],
7070
# "redirect": [],
7171
# "brandlink": "index.html",

‎site/cwlsite-draft4-schemas.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[ {
22
"schema_in": {
33
"class": "File",
4-
"path": "../draft-4/CommonWorkflowLanguage.yml",
4+
"path": "../v1.0/CommonWorkflowLanguage.yml",
55
"secondaryFiles": {"$import": "draft4-deps.json"}
66
},
7-
"context_target": "draft-4/cwl-context.json",
8-
"rdfs_target": "draft-4/cwl.ttl"
7+
"context_target": "v1.0/cwl-context.json",
8+
"rdfs_target": "v1.0/cwl.ttl"
99
}, {
1010
"schema_in": {$import: draft4-metaschema.json},
11-
"context_target": "draft-4/salad-context.json",
12-
"rdfs_target": "draft-4/salad.ttl"
11+
"context_target": "v1.0/salad-context.json",
12+
"rdfs_target": "v1.0/salad.ttl"
1313
}
1414
]

‎site/cwlsite.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: cwl:v1.0.dev4
33

44
class: Workflow
55
inputs:

‎site/draft4-deps.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{
66
"basename": "concepts.md",
77
"class": "File",
8-
"location": "../draft-4/concepts.md"
8+
"location": "../v1.0/concepts.md"
99
},
1010
{
1111
"basename": "salad",
@@ -25,7 +25,7 @@
2525
{
2626
"basename": "metaschema_base.yml",
2727
"class": "File",
28-
"location": "../draft-4/salad/schema_salad/metaschema/metaschema_base.yml"
28+
"location": "../v1.0/salad/schema_salad/metaschema/metaschema_base.yml"
2929
}
3030
]
3131
}
@@ -36,55 +36,55 @@
3636
],
3737
"basename": "Process.yml",
3838
"class": "File",
39-
"location": "../draft-4/Process.yml"
39+
"location": "../v1.0/Process.yml"
4040
},
4141
{
4242
"secondaryFiles": [
4343
{
4444
"basename": "contrib.md",
4545
"class": "File",
46-
"location": "../draft-4/contrib.md"
46+
"location": "../v1.0/contrib.md"
4747
},
4848
{
4949
"basename": "concepts.md",
5050
"class": "File",
51-
"location": "../draft-4/concepts.md"
51+
"location": "../v1.0/concepts.md"
5252
},
5353
{
5454
"basename": "invocation.md",
5555
"class": "File",
56-
"location": "../draft-4/invocation.md"
56+
"location": "../v1.0/invocation.md"
5757
},
5858
{
5959
"basename": "intro.md",
6060
"class": "File",
61-
"location": "../draft-4/intro.md"
61+
"location": "../v1.0/intro.md"
6262
}
6363
],
6464
"basename": "CommandLineTool.yml",
6565
"class": "File",
66-
"location": "../draft-4/CommandLineTool.yml"
66+
"location": "../v1.0/CommandLineTool.yml"
6767
},
6868
{
6969
"secondaryFiles": [
7070
{
7171
"basename": "contrib.md",
7272
"class": "File",
73-
"location": "../draft-4/contrib.md"
73+
"location": "../v1.0/contrib.md"
7474
},
7575
{
7676
"basename": "concepts.md",
7777
"class": "File",
78-
"location": "../draft-4/concepts.md"
78+
"location": "../v1.0/concepts.md"
7979
},
8080
{
8181
"basename": "intro.md",
8282
"class": "File",
83-
"location": "../draft-4/intro.md"
83+
"location": "../v1.0/intro.md"
8484
}
8585
],
8686
"basename": "Workflow.yml",
8787
"class": "File",
88-
"location": "../draft-4/Workflow.yml"
88+
"location": "../v1.0/Workflow.yml"
8989
}
9090
]

‎site/draft4-metaschema.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,105 +5,105 @@
55
{
66
"basename": "link_res_schema.yml",
77
"class": "File",
8-
"location": "../draft-4/salad/schema_salad/metaschema/link_res_schema.yml"
8+
"location": "../v1.0/salad/schema_salad/metaschema/link_res_schema.yml"
99
},
1010
{
1111
"basename": "link_res_src.yml",
1212
"class": "File",
13-
"location": "../draft-4/salad/schema_salad/metaschema/link_res_src.yml"
13+
"location": "../v1.0/salad/schema_salad/metaschema/link_res_src.yml"
1414
},
1515
{
1616
"basename": "link_res_proc.yml",
1717
"class": "File",
18-
"location": "../draft-4/salad/schema_salad/metaschema/link_res_proc.yml"
18+
"location": "../v1.0/salad/schema_salad/metaschema/link_res_proc.yml"
1919
}
2020
],
2121
"basename": "link_res.yml",
2222
"class": "File",
23-
"location": "../draft-4/salad/schema_salad/metaschema/link_res.yml"
23+
"location": "../v1.0/salad/schema_salad/metaschema/link_res.yml"
2424
},
2525
{
2626
"basename": "salad.md",
2727
"class": "File",
28-
"location": "../draft-4/salad/schema_salad/metaschema/salad.md"
28+
"location": "../v1.0/salad/schema_salad/metaschema/salad.md"
2929
},
3030
{
3131
"basename": "metaschema_base.yml",
3232
"class": "File",
33-
"location": "../draft-4/salad/schema_salad/metaschema/metaschema_base.yml"
33+
"location": "../v1.0/salad/schema_salad/metaschema/metaschema_base.yml"
3434
},
3535
{
3636
"basename": "import_include.md",
3737
"class": "File",
38-
"location": "../draft-4/salad/schema_salad/metaschema/import_include.md"
38+
"location": "../v1.0/salad/schema_salad/metaschema/import_include.md"
3939
},
4040
{
4141
"secondaryFiles": [
4242
{
4343
"basename": "field_name_src.yml",
4444
"class": "File",
45-
"location": "../draft-4/salad/schema_salad/metaschema/field_name_src.yml"
45+
"location": "../v1.0/salad/schema_salad/metaschema/field_name_src.yml"
4646
},
4747
{
4848
"basename": "field_name_schema.yml",
4949
"class": "File",
50-
"location": "../draft-4/salad/schema_salad/metaschema/field_name_schema.yml"
50+
"location": "../v1.0/salad/schema_salad/metaschema/field_name_schema.yml"
5151
},
5252
{
5353
"basename": "field_name_proc.yml",
5454
"class": "File",
55-
"location": "../draft-4/salad/schema_salad/metaschema/field_name_proc.yml"
55+
"location": "../v1.0/salad/schema_salad/metaschema/field_name_proc.yml"
5656
}
5757
],
5858
"basename": "field_name.yml",
5959
"class": "File",
60-
"location": "../draft-4/salad/schema_salad/metaschema/field_name.yml"
60+
"location": "../v1.0/salad/schema_salad/metaschema/field_name.yml"
6161
},
6262
{
6363
"secondaryFiles": [
6464
{
6565
"basename": "ident_res_proc.yml",
6666
"class": "File",
67-
"location": "../draft-4/salad/schema_salad/metaschema/ident_res_proc.yml"
67+
"location": "../v1.0/salad/schema_salad/metaschema/ident_res_proc.yml"
6868
},
6969
{
7070
"basename": "ident_res_schema.yml",
7171
"class": "File",
72-
"location": "../draft-4/salad/schema_salad/metaschema/ident_res_schema.yml"
72+
"location": "../v1.0/salad/schema_salad/metaschema/ident_res_schema.yml"
7373
},
7474
{
7575
"basename": "ident_res_src.yml",
7676
"class": "File",
77-
"location": "../draft-4/salad/schema_salad/metaschema/ident_res_src.yml"
77+
"location": "../v1.0/salad/schema_salad/metaschema/ident_res_src.yml"
7878
}
7979
],
8080
"basename": "ident_res.yml",
8181
"class": "File",
82-
"location": "../draft-4/salad/schema_salad/metaschema/ident_res.yml"
82+
"location": "../v1.0/salad/schema_salad/metaschema/ident_res.yml"
8383
},
8484
{
8585
"secondaryFiles": [
8686
{
8787
"basename": "vocab_res_schema.yml",
8888
"class": "File",
89-
"location": "../draft-4/salad/schema_salad/metaschema/vocab_res_schema.yml"
89+
"location": "../v1.0/salad/schema_salad/metaschema/vocab_res_schema.yml"
9090
},
9191
{
9292
"basename": "vocab_res_proc.yml",
9393
"class": "File",
94-
"location": "../draft-4/salad/schema_salad/metaschema/vocab_res_proc.yml"
94+
"location": "../v1.0/salad/schema_salad/metaschema/vocab_res_proc.yml"
9595
},
9696
{
9797
"basename": "vocab_res_src.yml",
9898
"class": "File",
99-
"location": "../draft-4/salad/schema_salad/metaschema/vocab_res_src.yml"
99+
"location": "../v1.0/salad/schema_salad/metaschema/vocab_res_src.yml"
100100
}
101101
],
102102
"basename": "vocab_res.yml",
103103
"class": "File",
104-
"location": "../draft-4/salad/schema_salad/metaschema/vocab_res.yml"
104+
"location": "../v1.0/salad/schema_salad/metaschema/vocab_res.yml"
105105
}
106106
],
107107
"class": "File",
108-
"location": "../draft-4/salad/schema_salad/metaschema/metaschema.yml"
108+
"location": "../v1.0/salad/schema_salad/metaschema/metaschema.yml"
109109
}

‎site/linkchecker.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
dockerFile: |

‎site/makecontext.cwl

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

‎site/makedoc.cwl

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

‎site/makerdfs.cwl

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

‎site/makespec.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cwlVersion: draft-4.dev3
1+
cwlVersion: v1.0.dev4
22
class: Workflow
33

44
inputs:

‎site/mergesecondary.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: ExpressionTool
2-
cwlVersion: draft-4.dev3
2+
cwlVersion: v1.0.dev4
33
inputs:
44
primary: File
55
secondary: File[]

0 commit comments

Comments
 (0)