Skip to content

Commit 565eb43

Browse files
authored
Merge pull request #58 from common-workflow-language/prep-release
Update instances of v1.1.0-dev1 to v1.1 to prepare for release.
2 parents a6cb03b + fa77f6a commit 565eb43

File tree

298 files changed

+350
-9172
lines changed

Some content is hidden

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

298 files changed

+350
-9172
lines changed

CommandLineTool.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ $graph:
1010
type: documentation
1111
doc:
1212
- |
13-
# Common Workflow Language (CWL) Command Line Tool Description, v1.1.0-dev1
13+
# Common Workflow Language (CWL) Command Line Tool Description, v1.1
1414
1515
This version:
16-
* https://w3id.org/cwl/v1.1.0-dev1/
16+
* https://w3id.org/cwl/v1.1/
1717
1818
Current version:
1919
* https://w3id.org/cwl/
@@ -37,17 +37,17 @@ $graph:
3737
- {$include: intro.md}
3838

3939
- |
40-
## Introduction to the CWL Command Line Tool standard v1.1.0-dev1
40+
## Introduction to the CWL Command Line Tool standard v1.1
4141
4242
This specification represents the latest development release from the
4343
CWL group. Since the v1.0 release, v1.1 introduces the
4444
following updates to the CWL Command Line Tool standard.
45-
Documents should use `cwlVersion: v1.1.0-dev1` to make use of new
46-
syntax and features introduced in v1.1.0-dev1. Existing v1.0 documents
45+
Documents should use `cwlVersion: v1.1` to make use of new
46+
syntax and features introduced in v1.1. Existing v1.0 documents
4747
should be trivially updatable by changing `cwlVersion`, however
4848
CWL documents that relied on previously undefined or
4949
underspecified behavior may have slightly different behavior in
50-
v1.1.0-dev1.
50+
v1.1.
5151
5252
## Changelog
5353
@@ -121,7 +121,7 @@ $graph:
121121
type, or a valid expression which returns a value having one
122122
of the the other types defined for that field.
123123
124-
See also the [CWL Workflow Description, v1.1.0-dev1 changelog](Workflow.html#Changelog).
124+
See also the [CWL Workflow Description, v1.1 changelog](Workflow.html#Changelog).
125125
126126
## Purpose
127127

Process.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $namespaces:
88

99
$graph:
1010

11-
- name: "Common Workflow Language, v1.1.0-dev1"
11+
- name: "Common Workflow Language, v1.1"
1212
type: documentation
1313
doc: {$include: concepts.md}
1414

@@ -38,7 +38,8 @@ $graph:
3838
- cwl:draft-4.dev3
3939
- cwl:v1.0.dev4
4040
- cwl:v1.0
41-
- cwl:v1.1.0-dev1 # a dash is required by the semver 2.0 rules
41+
- cwl:v1.1.0-dev1 # a dash is required by the semver 2.0 rules
42+
- cwl:v1.1
4243

4344
- name: CWLType
4445
type: enum

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Proposed changes that aren't yet implemented are tracked at https://github.com/c
66

77
You can render this using https://github.com/common-workflow-language/cwl-website/blob/master/website.sh
88

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/

Workflow.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ $graph:
1111
type: documentation
1212
doc:
1313
- |
14-
# Common Workflow Language (CWL) Workflow Description, v1.1.0-dev1
14+
# Common Workflow Language (CWL) Workflow Description, v1.1
1515
1616
This version:
17-
* https://w3id.org/cwl/v1.1.0-dev1/
17+
* https://w3id.org/cwl/v1.1/
1818
1919
Current version:
2020
* https://w3id.org/cwl/
@@ -35,17 +35,17 @@ $graph:
3535

3636
- |
3737
38-
## Introduction to CWL Workflow standard v1.1.0-dev1
38+
## Introduction to CWL Workflow standard v1.1
3939
4040
This specification represents the latest stable release from the
41-
CWL group. Since the v1.0 release, v1.1.0-dev1 introduces the
41+
CWL group. Since the v1.0 release, v1.1 introduces the
4242
following updates to the CWL Workflow standard.
43-
Documents should to use `cwlVersion: v1.1.0-dev1` to make use of new
44-
syntax and features introduced in v1.1.0-dev1. Existing v1.0 documents
43+
Documents should to use `cwlVersion: v1.1` to make use of new
44+
syntax and features introduced in v1.1. Existing v1.0 documents
4545
should be trivially updatable by changing `cwlVersion`, however
4646
CWL documents that relied on previously undefined or
4747
underspecified behavior may have slightly different behavior in
48-
v1.1.0-dev1.
48+
v1.1.
4949
5050
## Changelog
5151
@@ -104,7 +104,7 @@ $graph:
104104
type, or a valid expression which returns a value having one
105105
of the the other types defined for that field.
106106
107-
See also the [CWL Command Line Tool Description, v1.1.0-dev1 changelog](CommandLineTool.html#Changelog).
107+
See also the [CWL Command Line Tool Description, v1.1 changelog](CommandLineTool.html#Changelog).
108108
109109
## Purpose
110110

concepts.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ 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/v1.1.0-dev1
92+
https://github.com/common-workflow-language/common-workflow-language/tree/master/v1.1
9393

9494
### map
9595

9696
Note: This section is non-normative.
97-
> type: array<ComplexType> |
97+
> type: array<ComplexType> |
9898
> map<`key_field`, ComplexType>
9999
100100
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:
114114
```
115115

116116
Option one specific example using [Workflow](Workflow.html#Workflow).[inputs](Workflow.html#WorkflowInputParameter):
117-
> array<InputParameter> |
117+
> array<InputParameter> |
118118
> map<`id`, `type` | InputParameter>
119119
120120

@@ -147,7 +147,7 @@ some_cwl_field:
147147
```
148148

149149
Option two specific example using [Workflow](Workflow.html#Workflow).[inputs](Workflow.html#WorkflowInputParameter):
150-
> array<InputParameter> |
150+
> array<InputParameter> |
151151
> map<`id`, `type` | InputParameter>
152152
153153

@@ -161,7 +161,7 @@ inputs:
161161
```
162162

163163
Option two specific example using [SoftwareRequirement](#SoftwareRequirement).[packages](#SoftwarePackage):
164-
> array<SoftwarePackage> |
164+
> array<SoftwarePackage> |
165165
> map<`package`, `specs` | SoftwarePackage>
166166
167167

@@ -177,7 +177,7 @@ hints:
177177
```
178178
`
179179
Sometimes we have a third and even more compact option denoted like this:
180-
> type: array<ComplexType> |
180+
> type: array<ComplexType> |
181181
> map<`key_field`, `field2` | ComplexType>
182182
183183
For this example, if we only need the `key_field` and `field2` when specifying
@@ -204,7 +204,7 @@ inputs:
204204
```
205205

206206
Option three specific example using [SoftwareRequirement](#SoftwareRequirement).[packages](#SoftwarePackage):
207-
> array<SoftwarePackage> |
207+
> array<SoftwarePackage> |
208208
> map<`package`, `specs` | SoftwarePackage>
209209
210210

@@ -248,7 +248,7 @@ inputs:
248248
```
249249

250250
Mixed option 2 and 3 specific example using [SoftwareRequirement](#SoftwareRequirement).[packages](#SoftwarePackage):
251-
> array<SoftwarePackage> |
251+
> array<SoftwarePackage> |
252252
> map<`package`, `specs` | SoftwarePackage>
253253
254254

@@ -403,7 +403,7 @@ as if they were specified there.
403403
Requirements specified in a parent Workflow are inherited by step processes
404404
if they are valid for that step. If the substep is a CommandLineTool
405405
only the `InlineJavascriptRequirement`, `SchemaDefRequirement`, `DockerRequirement`,
406-
`SoftwareRequirement`, `InitialWorkDirRequirement`, `EnvVarRequirement`,
406+
`SoftwareRequirement`, `InitialWorkDirRequirement`, `EnvVarRequirement`,
407407
`ShellCommandRequirement`, `ResourceRequirement` are valid.
408408

409409
*As good practice, it is best to have process requirements be self-contained,

conformance_tests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2598,7 +2598,7 @@
25982598
doc: Test an anonymous enum inside an array inside a record, SchemaDefRequirement
25992599
tags: [command_line_tool, schema_def]
26002600

2601-
# New tests for v1.1.0-dev1
2601+
# New tests for v1.1
26022602

26032603
- job: tests/wc-job.json
26042604
output:
@@ -2831,15 +2831,15 @@
28312831
tool: tests/timelimit2-wf.cwl
28322832
label: timelimit_invalid_wf
28332833
doc: Test that workflow level time limit is not applied to workflow execution time
2834-
tags: [ workflow, timelimit ]
2834+
tags: [ workflow, timelimit, inline_javascript ]
28352835

28362836
- job: tests/empty.json
28372837
output:
28382838
o: time passed
28392839
tool: tests/timelimit3-wf.cwl
28402840
label: timelimit_zero_unlimited_wf
28412841
doc: Test zero timelimit means no limit in workflow
2842-
tags: [ workflow, timelimit ]
2842+
tags: [ workflow, timelimit, inline_javascript ]
28432843

28442844
- job: tests/empty.json
28452845
should_fail: true

cwl-runner.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: v1.1.0-dev1
3+
cwlVersion: v1.1
44

55
doc: |
66
Generic interface to run a Common Workflow Language tool or workflow from the

index.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
# Common Workflow Language Specifications, v1.1.0-dev1
2-
3-
<!-- remove this before v1.1 is final! -->
4-
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
1+
# Common Workflow Language Specifications, v1.1
52

63
The CWL specifications are divided up into several documents.
74

salad/gittaggers.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

salad/mypy.ini

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)