Doc updater

cwltool/schemas/README.md

@@ -21,15 +21,11 @@ provides a gentle introduction to writing CWL command line tool and workflow des
 
 ## CWL Specification
 
-The current stable specification is [draft 3](http://www.commonwl.org/draft-3/):
+The current stable specification is [v1.0](http://www.commonwl.org/v1.0/):
 
-http://www.commonwl.org/draft-3/
+http://www.commonwl.org/draft-v1.0/
 
-The next work-in-progress specification is [draft 4](http://www.commonwl.org/draft-4/):
-
-http://www.commonwl.org/draft-4/
-
-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/)
+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/)
 
 ### Citation
 

cwltool/schemas/draft-3/Workflow.yml

@@ -378,8 +378,8 @@ $graph:
   extends: "#Process"
   documentRoot: true
   specialize:
-    specializeFrom: "#OutputParameter"
-    specializeTo: "#WorkflowOutputParameter"
+    - specializeFrom: "#OutputParameter"
+      specializeTo: "#WorkflowOutputParameter"
   doc: |
     A workflow describes a set of **steps** and the **dependencies** between
     those processes.  When a process produces output that will be consumed by a

cwltool/schemas/draft-3/salad/schema_salad/metaschema/metaschema.yml

@@ -302,8 +302,8 @@ $graph:
   extends: ["#NamedType", "#RecordSchema", "#SchemaDefinedType"]
   documentRoot: true
   specialize:
-    specializeFrom: "#RecordField"
-    specializeTo: "#SaladRecordField"
+    - specializeFrom: "#RecordField"
+      specializeTo: "#SaladRecordField"
   fields:
     - name: abstract
       type: ["null", boolean]

cwltool/schemas/site/cwlsite-draft4-job.json

@@ -1,9 +1,9 @@
 [{
     "source": {
                 "class": "File",
-                "path": "../draft-4/README.md"
+                "path": "../v1.0/README.md"
             },
-            "target": "draft-4/index.html",
+            "target": "v1.0/index.html",
             "renderlist": [],
             "redirect": [],
             "brandlink": "../index.html",
@@ -13,10 +13,10 @@
         {
             "source": {
                 "class": "File",
-                "path": "../draft-4/CommandLineTool-standalone.yml",
+                "path": "../v1.0/CommandLineTool-standalone.yml",
                 "secondaryFiles": {"$import": "draft4-deps.json"}
             },
-            "target": "draft-4/CommandLineTool.html",
+            "target": "v1.0/CommandLineTool.html",
             "renderlist": [
                 "https://w3id.org/cwl/cwl#CommandLineToolDoc",
                 "https://w3id.org/cwl/cwl#CommandLineTool"
@@ -29,10 +29,10 @@
         {
             "source": {
                 "class": "File",
-                "path": "../draft-4/CommonWorkflowLanguage.yml",
+                "path": "../v1.0/CommonWorkflowLanguage.yml",
                 "secondaryFiles": {"$import": "draft4-deps.json"}
             },
-            "target": "draft-4/Workflow.html",
+            "target": "v1.0/Workflow.html",
             "renderlist": [
                 "https://w3id.org/cwl/cwl#WorkflowDoc",
                 "https://w3id.org/cwl/cwl#Workflow"
@@ -51,7 +51,7 @@
         },
         {
             "source": {$import: draft4-metaschema.json},
-            "target": "draft-4/SchemaSalad.html",
+            "target": "v1.0/SchemaSalad.html",
             "renderlist": [
                 "https://w3id.org/cwl/salad#Semantic_Annotations_for_Linked_Avro_Data",
                 "https://w3id.org/cwl/salad#SaladRecordSchema",
@@ -65,7 +65,7 @@
         },
         #{
         #    "source": {"$import": "userguide-draft4-input.json"},
-        #    "target": "draft-4/UserGuide.html",
+        #    "target": "v1.0/UserGuide.html",
         #    "renderlist": [],
         #    "redirect": [],
         #    "brandlink": "index.html",

cwltool/schemas/site/cwlsite-draft4-schemas.json

@@ -1,14 +1,14 @@
 [    {
         "schema_in": {
             "class": "File",
-            "path": "../draft-4/CommonWorkflowLanguage.yml",
+            "path": "../v1.0/CommonWorkflowLanguage.yml",
             "secondaryFiles": {"$import": "draft4-deps.json"}
         },
-        "context_target": "draft-4/cwl-context.json",
-        "rdfs_target": "draft-4/cwl.ttl"
+        "context_target": "v1.0/cwl-context.json",
+        "rdfs_target": "v1.0/cwl.ttl"
     }, {
         "schema_in": {$import: draft4-metaschema.json},
-        "context_target": "draft-4/salad-context.json",
-        "rdfs_target": "draft-4/salad.ttl"
+        "context_target": "v1.0/salad-context.json",
+        "rdfs_target": "v1.0/salad.ttl"
     }
 ]

cwltool/schemas/site/cwlsite.cwl

@@ -1,5 +1,5 @@
 #!/usr/bin/env cwl-runner
-cwlVersion: cwl:draft-4.dev3
+cwlVersion: cwl:v1.0.dev4
 
 class: Workflow
 inputs:

cwltool/schemas/site/draft4-deps.json

@@ -5,7 +5,7 @@
                 {
                     "basename": "concepts.md",
                     "class": "File",
-                    "location": "../draft-4/concepts.md"
+                    "location": "../v1.0/concepts.md"
                 },
                 {
                     "basename": "salad",
@@ -25,7 +25,7 @@
                                         {
                                             "basename": "metaschema_base.yml",
                                             "class": "File",
-                                            "location": "../draft-4/salad/schema_salad/metaschema/metaschema_base.yml"
+                                            "location": "../v1.0/salad/schema_salad/metaschema/metaschema_base.yml"
                                         }
                                     ]
                                 }
@@ -36,55 +36,55 @@
             ],
             "basename": "Process.yml",
             "class": "File",
-            "location": "../draft-4/Process.yml"
+            "location": "../v1.0/Process.yml"
         },
         {
             "secondaryFiles": [
                 {
                     "basename": "contrib.md",
                     "class": "File",
-                    "location": "../draft-4/contrib.md"
+                    "location": "../v1.0/contrib.md"
                 },
                 {
                     "basename": "concepts.md",
                     "class": "File",
-                    "location": "../draft-4/concepts.md"
+                    "location": "../v1.0/concepts.md"
                 },
                 {
                     "basename": "invocation.md",
                     "class": "File",
-                    "location": "../draft-4/invocation.md"
+                    "location": "../v1.0/invocation.md"
                 },
                 {
                     "basename": "intro.md",
                     "class": "File",
-                    "location": "../draft-4/intro.md"
+                    "location": "../v1.0/intro.md"
                 }
             ],
             "basename": "CommandLineTool.yml",
             "class": "File",
-            "location": "../draft-4/CommandLineTool.yml"
+            "location": "../v1.0/CommandLineTool.yml"
         },
         {
             "secondaryFiles": [
                 {
                     "basename": "contrib.md",
                     "class": "File",
-                    "location": "../draft-4/contrib.md"
+                    "location": "../v1.0/contrib.md"
                 },
                 {
                     "basename": "concepts.md",
                     "class": "File",
-                    "location": "../draft-4/concepts.md"
+                    "location": "../v1.0/concepts.md"
                 },
                 {
                     "basename": "intro.md",
                     "class": "File",
-                    "location": "../draft-4/intro.md"
+                    "location": "../v1.0/intro.md"
                 }
             ],
             "basename": "Workflow.yml",
             "class": "File",
-            "location": "../draft-4/Workflow.yml"
+            "location": "../v1.0/Workflow.yml"
         }
     ]

cwltool/schemas/site/draft4-metaschema.json

@@ -5,105 +5,105 @@
                 {
                     "basename": "link_res_schema.yml", 
                     "class": "File", 
-                    "location": "../draft-4/salad/schema_salad/metaschema/link_res_schema.yml"
+                    "location": "../v1.0/salad/schema_salad/metaschema/link_res_schema.yml"
                 }, 
                 {
                     "basename": "link_res_src.yml", 
                     "class": "File", 
-                    "location": "../draft-4/salad/schema_salad/metaschema/link_res_src.yml"
+                    "location": "../v1.0/salad/schema_salad/metaschema/link_res_src.yml"
                 }, 
                 {
                     "basename": "link_res_proc.yml", 
                     "class": "File", 
-                    "location": "../draft-4/salad/schema_salad/metaschema/link_res_proc.yml"
+                    "location": "../v1.0/salad/schema_salad/metaschema/link_res_proc.yml"
                 }
             ], 
             "basename": "link_res.yml", 
             "class": "File", 
-            "location": "../draft-4/salad/schema_salad/metaschema/link_res.yml"
+            "location": "../v1.0/salad/schema_salad/metaschema/link_res.yml"
         }, 
         {
             "basename": "salad.md", 
             "class": "File", 
-            "location": "../draft-4/salad/schema_salad/metaschema/salad.md"
+            "location": "../v1.0/salad/schema_salad/metaschema/salad.md"
         }, 
         {
             "basename": "metaschema_base.yml", 
             "class": "File", 
-            "location": "../draft-4/salad/schema_salad/metaschema/metaschema_base.yml"
+            "location": "../v1.0/salad/schema_salad/metaschema/metaschema_base.yml"
         }, 
         {
             "basename": "import_include.md", 
             "class": "File", 
-            "location": "../draft-4/salad/schema_salad/metaschema/import_include.md"
+            "location": "../v1.0/salad/schema_salad/metaschema/import_include.md"
         }, 
         {
             "secondaryFiles": [
                 {
                     "basename": "field_name_src.yml", 
                     "class": "File", 
-                    "location": "../draft-4/salad/schema_salad/metaschema/field_name_src.yml"
+                    "location": "../v1.0/salad/schema_salad/metaschema/field_name_src.yml"
                 }, 
                 {
                     "basename": "field_name_schema.yml", 
                     "class": "File", 
-                    "location": "../draft-4/salad/schema_salad/metaschema/field_name_schema.yml"
+                    "location": "../v1.0/salad/schema_salad/metaschema/field_name_schema.yml"
                 }, 
                 {
                     "basename": "field_name_proc.yml", 
                     "class": "File", 
-                    "location": "../draft-4/salad/schema_salad/metaschema/field_name_proc.yml"
+                    "location": "../v1.0/salad/schema_salad/metaschema/field_name_proc.yml"
                 }
             ], 
             "basename": "field_name.yml", 
             "class": "File", 
-            "location": "../draft-4/salad/schema_salad/metaschema/field_name.yml"
+            "location": "../v1.0/salad/schema_salad/metaschema/field_name.yml"
         }, 
         {
             "secondaryFiles": [
                 {
                     "basename": "ident_res_proc.yml", 
                     "class": "File", 
-                    "location": "../draft-4/salad/schema_salad/metaschema/ident_res_proc.yml"
+                    "location": "../v1.0/salad/schema_salad/metaschema/ident_res_proc.yml"
                 }, 
                 {
                     "basename": "ident_res_schema.yml", 
                     "class": "File", 
-                    "location": "../draft-4/salad/schema_salad/metaschema/ident_res_schema.yml"
+                    "location": "../v1.0/salad/schema_salad/metaschema/ident_res_schema.yml"
                 }, 
                 {
                     "basename": "ident_res_src.yml", 
                     "class": "File", 
-                    "location": "../draft-4/salad/schema_salad/metaschema/ident_res_src.yml"
+                    "location": "../v1.0/salad/schema_salad/metaschema/ident_res_src.yml"
                 }
             ], 
             "basename": "ident_res.yml", 
             "class": "File", 
-            "location": "../draft-4/salad/schema_salad/metaschema/ident_res.yml"
+            "location": "../v1.0/salad/schema_salad/metaschema/ident_res.yml"
         }, 
         {
             "secondaryFiles": [
                 {
                     "basename": "vocab_res_schema.yml", 
                     "class": "File", 
-                    "location": "../draft-4/salad/schema_salad/metaschema/vocab_res_schema.yml"
+                    "location": "../v1.0/salad/schema_salad/metaschema/vocab_res_schema.yml"
                 }, 
                 {
                     "basename": "vocab_res_proc.yml", 
                     "class": "File", 
-                    "location": "../draft-4/salad/schema_salad/metaschema/vocab_res_proc.yml"
+                    "location": "../v1.0/salad/schema_salad/metaschema/vocab_res_proc.yml"
                 }, 
                 {
                     "basename": "vocab_res_src.yml", 
                     "class": "File", 
-                    "location": "../draft-4/salad/schema_salad/metaschema/vocab_res_src.yml"
+                    "location": "../v1.0/salad/schema_salad/metaschema/vocab_res_src.yml"
                 }
             ], 
             "basename": "vocab_res.yml", 
             "class": "File", 
-            "location": "../draft-4/salad/schema_salad/metaschema/vocab_res.yml"
+            "location": "../v1.0/salad/schema_salad/metaschema/vocab_res.yml"
         }
     ], 
     "class": "File", 
-    "location": "../draft-4/salad/schema_salad/metaschema/metaschema.yml"
+    "location": "../v1.0/salad/schema_salad/metaschema/metaschema.yml"
 }

cwltool/schemas/site/linkchecker.cwl

@@ -1,5 +1,5 @@
 class: CommandLineTool
-cwlVersion: draft-4.dev3
+cwlVersion: v1.0.dev4
 hints:
   DockerRequirement:
     dockerFile: |

cwltool/schemas/site/makecontext.cwl

@@ -1,4 +1,4 @@
-cwlVersion: draft-4.dev3
+cwlVersion: v1.0.dev4
 class: CommandLineTool
 inputs:
   schema:

cwltool/schemas/site/makedoc.cwl

@@ -1,4 +1,4 @@
-cwlVersion: draft-4.dev3
+cwlVersion: v1.0.dev4
 class: CommandLineTool
 requirements:
   - class: InlineJavascriptRequirement

cwltool/schemas/site/makerdfs.cwl

@@ -1,4 +1,4 @@
-cwlVersion: draft-4.dev3
+cwlVersion: v1.0.dev4
 class: CommandLineTool
 inputs:
   schema:

cwltool/schemas/site/makespec.cwl

@@ -1,4 +1,4 @@
-cwlVersion: draft-4.dev3
+cwlVersion: v1.0.dev4
 class: Workflow
 
 inputs:

cwltool/schemas/site/mergesecondary.cwl

@@ -1,5 +1,5 @@
 class: ExpressionTool
-cwlVersion: draft-4.dev3
+cwlVersion: v1.0.dev4
 inputs:
   primary: File
   secondary: File[]