Update a few more instances of v1.1.0-dev1

Peter Amstutz · Peter Amstutz · commit f47b309ae936 · 2019-05-06T11:17:51.000-04:00
diff --git a/Process.yml b/Process.yml
@@ -38,7 +38,7 @@ $graph:
     - cwl:draft-4.dev3
     - cwl:v1.0.dev4
     - cwl:v1.0
-    - cwl:v1.1.0-dev1 # a dash is required by the semver 2.0 rules
+    - cwl:v1.1.0-dev1   # a dash is required by the semver 2.0 rules
     - cwl:v1.1
 
 - name: CWLType
diff --git a/README.md b/README.md
@@ -6,4 +6,4 @@ Proposed changes that aren't yet implemented are tracked at https://github.com/c
 
 You can render this using https://github.com/common-workflow-language/cwl-website/blob/master/website.sh
 
-The current rendering is at https://www.commonwl.org/v1.1.0-dev1/
+The current rendering is at https://www.commonwl.org/v1.1/
diff --git a/concepts.md b/concepts.md
@@ -89,12 +89,12 @@ preprocessing steps described in the
 [Semantic Annotations for Linked Avro Data (SALAD) Specification](SchemaSalad.html).
 An implementation may formally validate the structure of a CWL document using
 SALAD schemas located at
-https://github.com/common-workflow-language/common-workflow-language/tree/master/v1.1.0-dev1
+https://github.com/common-workflow-language/common-workflow-language/tree/master/v1.1
 
 ### map
 
 Note: This section is non-normative.
-> type: array&lt;ComplexType&gt; |  
+> type: array&lt;ComplexType&gt; |
 > map&lt;`key_field`, ComplexType&gt;
 
 The above syntax in the CWL specifications means there are two or more ways to write the given value.
@@ -114,7 +114,7 @@ some_cwl_field:
 ```
 
 Option one specific example using [Workflow](Workflow.html#Workflow).[inputs](Workflow.html#WorkflowInputParameter):
-> array&lt;InputParameter&gt; |  
+> array&lt;InputParameter&gt; |
 > map&lt;`id`, `type` | InputParameter&gt;
 
 
@@ -147,7 +147,7 @@ some_cwl_field:
 ```
 
 Option two specific example using [Workflow](Workflow.html#Workflow).[inputs](Workflow.html#WorkflowInputParameter):
-> array&lt;InputParameter&gt; |  
+> array&lt;InputParameter&gt; |
 > map&lt;`id`, `type` | InputParameter&gt;
 
 
@@ -161,7 +161,7 @@ inputs:
 ```
 
 Option two specific example using [SoftwareRequirement](#SoftwareRequirement).[packages](#SoftwarePackage):
-> array&lt;SoftwarePackage&gt; |  
+> array&lt;SoftwarePackage&gt; |
 > map&lt;`package`, `specs` | SoftwarePackage&gt;
 
 
@@ -177,7 +177,7 @@ hints:
 ```
 `
 Sometimes we have a third and even more compact option denoted like this:
-> type: array&lt;ComplexType&gt; |  
+> type: array&lt;ComplexType&gt; |
 > map&lt;`key_field`, `field2` | ComplexType&gt;
 
 For this example, if we only need the `key_field` and `field2` when specifying
@@ -204,7 +204,7 @@ inputs:
 ```
 
 Option three specific example using [SoftwareRequirement](#SoftwareRequirement).[packages](#SoftwarePackage):
-> array&lt;SoftwarePackage&gt; |  
+> array&lt;SoftwarePackage&gt; |
 > map&lt;`package`, `specs` | SoftwarePackage&gt;
 
 
@@ -248,7 +248,7 @@ inputs:
 ```
 
 Mixed option 2 and 3 specific example using [SoftwareRequirement](#SoftwareRequirement).[packages](#SoftwarePackage):
-> array&lt;SoftwarePackage&gt; |  
+> array&lt;SoftwarePackage&gt; |
 > map&lt;`package`, `specs` | SoftwarePackage&gt;
 
 
@@ -403,7 +403,7 @@ as if they were specified there.
 Requirements specified in a parent Workflow are inherited by step processes
 if they are valid for that step. If the substep is a CommandLineTool
 only the `InlineJavascriptRequirement`, `SchemaDefRequirement`, `DockerRequirement`,
-`SoftwareRequirement`, `InitialWorkDirRequirement`, `EnvVarRequirement`, 
+`SoftwareRequirement`, `InitialWorkDirRequirement`, `EnvVarRequirement`,
 `ShellCommandRequirement`, `ResourceRequirement` are valid.
 
 *As good practice, it is best to have process requirements be self-contained,
diff --git a/conformance_tests.yaml b/conformance_tests.yaml
@@ -2598,7 +2598,7 @@
   doc: Test an anonymous enum inside an array inside a record, SchemaDefRequirement
   tags: [command_line_tool, schema_def]
 
-# New tests for v1.1.0-dev1
+# New tests for v1.1
 
 - job: tests/wc-job.json
   output:
diff --git a/cwl-runner.cwl b/cwl-runner.cwl
@@ -1,6 +1,6 @@
 #!/usr/bin/env cwl-runner
 class: CommandLineTool
-cwlVersion: v1.1.0-dev1
+cwlVersion: v1.1
 
 doc: |
  Generic interface to run a Common Workflow Language tool or workflow from the
diff --git a/index.md b/index.md
@@ -1,7 +1,4 @@
-# Common Workflow Language Specifications, v1.1.0-dev1
-
-<!-- remove this before v1.1 is final! -->
-WARNING, this is a draft and in progress! Development of CWL v1.1 is coordinated at https://github.com/common-workflow-language/common-workflow-language/milestone/6
+# Common Workflow Language Specifications, v1.1
 
 The CWL specifications are divided up into several documents.
 
diff --git a/tests/basename-fields-job.yml b/tests/basename-fields-job.yml
@@ -1,5 +1,4 @@
-cwlVersion: v1.1.0-dev1
+cwlVersion: v1.1
 tool:
   class: File
   path: echo-tool.cwl  # could have been any file, this isn't a secret CWL feature :-)
-
diff --git a/tests/cat1-testcli.cwl b/tests/cat1-testcli.cwl
@@ -1,7 +1,7 @@
 #!/usr/bin/env cwl-runner
 {
     "class": "CommandLineTool",
-    "cwlVersion": "v1.1.0-dev1",
+    "cwlVersion": "v1.1",
     "doc": "Print the contents of a file to stdout using 'cat' running in a docker container.",
     "hints": [
         {
diff --git a/tests/import_schema-def_packed.cwl b/tests/import_schema-def_packed.cwl
@@ -1,86 +1,86 @@
 {
-    "cwlVersion": "v1.1.0-dev1", 
+    "cwlVersion": "v1.1",
     "$graph": [
         {
             "inputs": [
                 {
-                    "type": "string", 
+                    "type": "string",
                     "id": "#main/bam"
-                }, 
+                },
                 {
-                    "type": "#capture_kit.yml/capture_kit", 
+                    "type": "#capture_kit.yml/capture_kit",
                     "id": "#main/capture_kit"
                 }
-            ], 
+            ],
             "requirements": [
                 {
-                    "class": "SchemaDefRequirement", 
+                    "class": "SchemaDefRequirement",
                     "types": [
                         {
                             "fields": [
                                 {
-                                    "type": "string", 
+                                    "type": "string",
                                     "name": "#capture_kit.yml/capture_kit/bait"
                                 }
-                            ], 
-                            "type": "record", 
+                            ],
+                            "type": "record",
                             "name": "#capture_kit.yml/capture_kit"
                         }
                     ]
                 }
-            ], 
+            ],
             "outputs": [
                 {
-                    "outputSource": "#main/touch_bam/empty_file", 
-                    "type": "File", 
+                    "outputSource": "#main/touch_bam/empty_file",
+                    "type": "File",
                     "id": "#main/output_bam"
                 }
-            ], 
-            "class": "Workflow", 
+            ],
+            "class": "Workflow",
             "steps": [
                 {
                     "out": [
                         "#main/touch_bam/empty_file"
-                    ], 
-                    "run": "#touch.cwl", 
-                    "id": "#main/touch_bam", 
+                    ],
+                    "run": "#touch.cwl",
+                    "id": "#main/touch_bam",
                     "in": [
                         {
-                            "source": "#main/bam", 
+                            "source": "#main/bam",
                             "id": "#main/touch_bam/name"
                         }
                     ]
                 }
-            ], 
+            ],
             "id": "#main"
-        }, 
+        },
         {
             "inputs": [
                 {
                     "inputBinding": {
                         "position": 0
-                    }, 
-                    "type": "string", 
+                    },
+                    "type": "string",
                     "id": "#touch.cwl/name"
                 }
-            ], 
+            ],
             "outputs": [
                 {
                     "outputBinding": {
                         "glob": "$(inputs.name)"
-                    }, 
-                    "type": "File", 
+                    },
+                    "type": "File",
                     "id": "#touch.cwl/empty_file"
                 }
-            ], 
+            ],
             "baseCommand": [
                 "touch"
-            ], 
-            "class": "CommandLineTool", 
-            "id": "#touch.cwl", 
+            ],
+            "class": "CommandLineTool",
+            "id": "#touch.cwl",
             "hints": [
                 {
-                    "dockerPull": "debian:stretch-slim", 
+                    "dockerPull": "debian:stretch-slim",
                     "class": "DockerRequirement"
                 }
             ]
diff --git a/tests/optional-output.cwl b/tests/optional-output.cwl
@@ -1,6 +1,6 @@
 #!/usr/bin/env cwl-runner
 class: CommandLineTool
-cwlVersion: "v1.1.0-dev1"
+cwlVersion: "v1.1"
 doc: "Print the contents of a file to stdout using 'cat' running in a docker container."
 hints:
   DockerRequirement:
diff --git a/tests/revsort-packed.cwl b/tests/revsort-packed.cwl
diff --git a/tests/tmap-tool.cwl b/tests/tmap-tool.cwl

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ Proposed changes that aren't yet implemented are tracked at https://github.com/c`
`6`	`6`
`7`	`7`	`You can render this using https://github.com/common-workflow-language/cwl-website/blob/master/website.sh`
`8`	`8`
`9`		`-The current rendering is at https://www.commonwl.org/v1.1.0-dev1/`
	`9`	`+The current rendering is at https://www.commonwl.org/v1.1/`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#!/usr/bin/env cwl-runner`
`2`	`2`	`{`
`3`	`3`	`"class": "CommandLineTool",`
`4`		`- "cwlVersion": "v1.1.0-dev1",`
	`4`	`+ "cwlVersion": "v1.1",`
`5`	`5`	`"doc": "Print the contents of a file to stdout using 'cat' running in a docker container.",`
`6`	`6`	`"hints": [`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,86 +1,86 @@`
`1`	`1`	`{`
`2`		`- "cwlVersion": "v1.1.0-dev1",`
	`2`	`+ "cwlVersion": "v1.1",`
`3`	`3`	`"$graph": [`
`4`	`4`	`{`
`5`	`5`	`"inputs": [`
`6`	`6`	`{`
`7`		`- "type": "string",`
	`7`	`+ "type": "string",`
`8`	`8`	`"id": "#main/bam"`
`9`		`- },`
	`9`	`+ },`
`10`	`10`	`{`
`11`		`- "type": "#capture_kit.yml/capture_kit",`
	`11`	`+ "type": "#capture_kit.yml/capture_kit",`
`12`	`12`	`"id": "#main/capture_kit"`
`13`	`13`	`}`
`14`		`- ],`
	`14`	`+ ],`
`15`	`15`	`"requirements": [`
`16`	`16`	`{`
`17`		`- "class": "SchemaDefRequirement",`
	`17`	`+ "class": "SchemaDefRequirement",`
`18`	`18`	`"types": [`
`19`	`19`	`{`
`20`	`20`	`"fields": [`
`21`	`21`	`{`
`22`		`- "type": "string",`
	`22`	`+ "type": "string",`
`23`	`23`	`"name": "#capture_kit.yml/capture_kit/bait"`
`24`	`24`	`}`
`25`		`- ],`
`26`		`- "type": "record",`
	`25`	`+ ],`
	`26`	`+ "type": "record",`
`27`	`27`	`"name": "#capture_kit.yml/capture_kit"`
`28`	`28`	`}`
`29`	`29`	`]`
`30`	`30`	`}`
`31`		`- ],`
	`31`	`+ ],`
`32`	`32`	`"outputs": [`
`33`	`33`	`{`
`34`		`- "outputSource": "#main/touch_bam/empty_file",`
`35`		`- "type": "File",`
	`34`	`+ "outputSource": "#main/touch_bam/empty_file",`
	`35`	`+ "type": "File",`
`36`	`36`	`"id": "#main/output_bam"`
`37`	`37`	`}`
`38`		`- ],`
`39`		`- "class": "Workflow",`
	`38`	`+ ],`
	`39`	`+ "class": "Workflow",`
`40`	`40`	`"steps": [`
`41`	`41`	`{`
`42`	`42`	`"out": [`
`43`	`43`	`"#main/touch_bam/empty_file"`
`44`		`- ],`
`45`		`- "run": "#touch.cwl",`
`46`		`- "id": "#main/touch_bam",`
	`44`	`+ ],`
	`45`	`+ "run": "#touch.cwl",`
	`46`	`+ "id": "#main/touch_bam",`
`47`	`47`	`"in": [`
`48`	`48`	`{`
`49`		`- "source": "#main/bam",`
	`49`	`+ "source": "#main/bam",`
`50`	`50`	`"id": "#main/touch_bam/name"`
`51`	`51`	`}`
`52`	`52`	`]`
`53`	`53`	`}`
`54`		`- ],`
	`54`	`+ ],`
`55`	`55`	`"id": "#main"`
`56`		`- },`
	`56`	`+ },`
`57`	`57`	`{`
`58`	`58`	`"inputs": [`
`59`	`59`	`{`
`60`	`60`	`"inputBinding": {`
`61`	`61`	`"position": 0`
`62`		`- },`
`63`		`- "type": "string",`
	`62`	`+ },`
	`63`	`+ "type": "string",`
`64`	`64`	`"id": "#touch.cwl/name"`
`65`	`65`	`}`
`66`		`- ],`
	`66`	`+ ],`
`67`	`67`	`"outputs": [`
`68`	`68`	`{`
`69`	`69`	`"outputBinding": {`
`70`	`70`	`"glob": "$(inputs.name)"`
`71`		`- },`
`72`		`- "type": "File",`
	`71`	`+ },`
	`72`	`+ "type": "File",`
`73`	`73`	`"id": "#touch.cwl/empty_file"`
`74`	`74`	`}`
`75`		`- ],`
	`75`	`+ ],`
`76`	`76`	`"baseCommand": [`
`77`	`77`	`"touch"`
`78`		`- ],`
`79`		`- "class": "CommandLineTool",`
`80`		`- "id": "#touch.cwl",`
	`78`	`+ ],`
	`79`	`+ "class": "CommandLineTool",`
	`80`	`+ "id": "#touch.cwl",`
`81`	`81`	`"hints": [`
`82`	`82`	`{`
`83`		`- "dockerPull": "debian:stretch-slim",`
	`83`	`+ "dockerPull": "debian:stretch-slim",`
`84`	`84`	`"class": "DockerRequirement"`
`85`	`85`	`}`
`86`	`86`	`]`