Skip to content

Commit b84ec22

Browse files
mr-cGlassOfWhiskey
authored andcommitted
start development of CWL v1.3.0-dev1
1 parent 59c3bea commit b84ec22

File tree

6 files changed

+29
-114
lines changed

6 files changed

+29
-114
lines changed

CommandLineTool.yml

Lines changed: 10 additions & 44 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.2
13+
# Common Workflow Language (CWL) Command Line Tool Description, v1.3.0-dev1
1414
1515
This version:
16-
* https://w3id.org/cwl/v1.2/
16+
* https://w3id.org/cwl/v1.3.0-dev1
1717
1818
Latest stable version:
1919
* https://w3id.org/cwl/
@@ -37,53 +37,19 @@ $graph:
3737
- {$include: intro.md}
3838

3939
- |
40-
## Introduction to the CWL Command Line Tool standard v1.2
41-
42-
This specification represents the latest development release from the
43-
CWL group. Since the v1.1 release, v1.2 introduces the
44-
following updates to the CWL Command Line Tool standard.
45-
Documents should use `cwlVersion: v1.2` to make use of new
46-
syntax and features introduced in v1.2. Existing v1.1 documents
47-
should be trivially updatable by changing `cwlVersion`, however
48-
CWL documents that relied on previously undefined or
49-
underspecified behavior may have slightly different behavior in
50-
v1.2.
40+
## Introduction to the CWL Command Line Tool standard v1.3.0-dev1
41+
42+
This specification represents the latest development version from the
43+
CWL group.
5144
5245
## Changelog
5346
54-
* `coresMin` and `coresMax` of
55-
[ResourceRequirement](#ResourceRequirement) may now request fractional CPUs.
56-
* `ramMin`, `ramMax`, `tmpdirMin`, `tmpdirMax`, `outdirMin`, and `outdirMax` of
57-
[ResourceRequirement](#ResourceRequirement) now accept floating point values.
58-
* [CommandLineTool](#CommandLineTool) can now express `intent`
59-
with an identifier for the type of computational operation.
60-
* Added conformance tests for order of operations evaluating `secondaryFiles` on input
61-
and ensure that input and output secondaryFiles expressions can return a File object.
62-
* Clarify there are no limits on the size of file literal `contents`.
63-
* When using `loadContents` it now must fail when attempting to
64-
load a file greater than 64 KiB instead of silently truncating
65-
the data.
66-
* Objects, arrays and numbers returned by parameter references
67-
or expressions in `Dirent.entry` that are not a `File` or
68-
`Directory` object (or array of such) are now specified to be
69-
JSON serialized to produce file contents.
70-
* Note that only enum and record types can be typedef-ed
71-
* Added conformance tests for order of operations evaluating `secondaryFiles` on input
72-
and ensure that input and output secondaryFiles expressions can return a File object.
73-
* Escaping in [string interpolation](#String_Interpolation) has
74-
been added to the specification along with conformance tests.
75-
* It is now possible to have an absolute path in the `entryname`
76-
field in
77-
[InitialWorkDirRequirement](#InitialWorkDirRequirement) when
78-
running in a mandatory container. Together with
79-
`DockerRequirement.dockerOutputDirectory` this it possible to
80-
control the locations of both input and output files when
81-
running in containers.
82-
* Specify default success/fail interpretation of exit codes when not given.
83-
84-
See also the [CWL Workflow Description, v1.2 changelog](Workflow.html#Changelog).
47+
48+
See also the [CWL Workflow Description, v1.3.0-dev1 changelog](Workflow.html#Changelog).
8549
For other changes since CWL v1.0, see the
8650
[CWL Command Line Tool Description, v1.1 changelog](https://www.commonwl.org/v1.1/CommandLineTool.html#Changelog)
51+
and
52+
[CWL Command Line Tool Description, v1.2 changelog](https://www.commonwl.org/v1.2/CommandLineTool.html#Changelog).
8753
8854
## Purpose
8955

Process.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ $graph:
4646
- cwl:v1.2.0-dev4
4747
- cwl:v1.2.0-dev5
4848
- cwl:v1.2
49+
- cwl:v1.3.0-dev1
4950

5051
- name: CWLType
5152
type: enum

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
Hello!
22

3-
This repo holds the development version of CWL v1.2.1; see https://github.com/common-workflow-language/cwl-v1.2/issues/54 for the plan.
4-
5-
See https://github.com/common-workflow-language/cwl-v1.2/tree/v1.2.0 for the released v1.2 of the Common Workflow Language standards and the history of its development.
6-
7-
You can render this using https://github.com/common-workflow-language/cwl-website/blob/main/website.sh
8-
9-
You may browse the released v1.2 standards online at https://www.commonwl.org/v1.2
3+
This repo holds the v1.3.0-dev0 in-development version of the Common Workflow Language standard and the history of its development.

Workflow.yml

Lines changed: 12 additions & 40 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.2
14+
# Common Workflow Language (CWL) Workflow Description, v1.3.0-dev1
1515
1616
This version:
17-
* https://w3id.org/cwl/v1.2/
17+
* https://w3id.org/cwl/v1.3.0-dev1
1818
1919
Latest stable version:
2020
* https://w3id.org/cwl/
@@ -35,49 +35,21 @@ $graph:
3535

3636
- |
3737
38-
## Introduction to CWL Workflow standard v1.2
38+
## Introduction to CWL Workflow standard v1.3.0-dev1
3939
40-
This specification represents the latest stable release from the
41-
CWL group. Since the v1.1 release, v1.2 introduces the
42-
following updates to the CWL Workflow standard.
43-
Documents should to use `cwlVersion: v1.2` to make use of new
44-
syntax and features introduced in v1.2. Existing v1.1 documents
45-
should be trivially updatable by changing `cwlVersion`, however
46-
CWL documents that relied on previously undefined or
47-
underspecified behavior may have slightly different behavior in
48-
v1.2. See note about `cwl-upgrader` in the changelog.
40+
This specification represents the latest development version from the
41+
CWL group.
42+
43+
4944
5045
## Changelog
5146
52-
* Adds `when` field to [WorkflowStep](#WorkflowStep) for conditional
53-
execution
54-
* Adds `pickValue` field to [WorkflowStepInput](#WorkflowStepInput) and
55-
[WorkflowOutputParameter](#WorkflowOutputParameter) for selecting among null and
56-
non-null source values
57-
* Add abstract [Operation](#Operation) that can be used as a
58-
no-op stand-in to describe abstract workflows.
59-
* [Workflow](#Workflow), [ExpressionTool](#ExpressionTool) and
60-
[Operation](#Operation) can now express `intent` with an
61-
identifier for the type of computational operation.
62-
* Clarify there are no limits on the size of file literal `contents`.
63-
* When using `loadContents` it now must fail when attempting to
64-
load a file greater than 64 KiB instead of silently truncating
65-
the data.
66-
* Note that only enum and record types can be typedef-ed
67-
* Escaping in [string interpolation](#String_Interpolation) has
68-
been added to the specification along with conformance tests.
69-
* Added discussion of [packed documents](#Packed_documents).
70-
* Specify behavior when `source` is a single-item list and no
71-
linkMerge is set.
72-
* Added discussion about handling different document versions.
73-
* Added definition of **data link**
74-
75-
See also the [CWL Command Line Tool Description, v1.2 changelog](CommandLineTool.html#Changelog).
76-
For other changes since CWL v1.0, see the
77-
[CWL Workflow Description, v1.1 changelog](https://www.commonwl.org/v1.1/Workflow.html#Changelog).
7847
79-
[`cwl-upgrader`](https://github.com/common-workflow-language/cwl-upgrader) can
80-
be used for upgrading CWL documents from version `draft-3`, `v1.0`, and `v1.1` to `v1.2`.
48+
See also the [CWL Command Line Tool Description, v1.3.0-dev1 changelog](CommandLineTool.html#Changelog).
49+
For other changes since CWL v1.0, see the
50+
[CWL Workflow Description, v1.1 changelog](https://www.commonwl.org/v1.1/Workflow.html#Changelog)
51+
and
52+
[CWL Workflow Description, v1.2 changelog](https://www.commonwl.org/v1.2/Workflow.html#Changelog)
8153
8254
## Purpose
8355

contrib.md

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,8 @@
11
Authors:
22

3-
* Peter Amstutz <[email protected]>, Curii Inc. / Arvados; https://orcid.org/0000-0003-3566-7705
4-
* Michael R. Crusoe <[email protected]>, CWL Project Lead; https://orcid.org/0000-0002-2961-9670
5-
* Kaushik Ghose <[email protected]>, Seven Bridges Genomics, Inc; https://orcid.org/0000-0003-2933-1260
63

7-
Contributors to v1.2:
4+
Contributors to v1.3.0-dev1:
85

9-
* John Chilton <[email protected]>, Galaxy Project, Pennsylvania State University; https://orcid.org/0000-0002-6794-0756
10-
* Michael Franklin <[email protected]>, Peter MacCallum Cancer Centre and University of Melbourne; https://orcid.org/0000-0001-9292-1533
11-
* Bogdan Gavrilovic <[email protected]>, Seven Bridges Genomics; https://orcid.org/0000-0003-1550-1716
12-
* Stian Soiland-Reyes, University of Manchester; https://orcid.org/0000-0001-9842-9718
13-
14-
Incorporates the work of past authors and contributors to [CWL v1.0](https://www.commonwl.org/v1.0/Workflow.html) and [CWL v1.1](https://www.commonwl.org/v1.1/Workflow.html).
15-
16-
This standard was [approved on 2020-08-07](https://github.com/common-workflow-language/cwl-v1.2/pull/47) by the CWL leadership team consisting of:
17-
18-
* Peter Amstutz, Curii Inc. / Arvados; https://orcid.org/0000-0003-3566-7705
19-
* John Chilton, Pennsylvania State University / Galaxy Project; https://orcid.org/0000-0002-6794-0756
20-
* Michael R. Crusoe, CWL Project Lead; https://orcid.org/0000-0002-2961-9670
21-
* Brandi Davis Dusenbery, Seven Bridges Genomics, Inc.; https://orcid.org/0000-0001-7811-8613
22-
* Jeff Gentry, Foundation Medicine; https://orcid.org/0000-0001-5351-8442
23-
* Hervé Ménager, Institut Pasteur; https://orcid.org/0000-0002-7552-1009
24-
* Stian Soiland-Reyes, University of Manchester; https://orcid.org/0000-0001-9842-9718
25-
26-
Publisher: [Common Workflow Language project](https://www.commonwl.org), a member project of [Software Freedom Conservancy](https://sfconservancy.org/)
6+
Incorporates the work of past authors and contributors to [CWL v1.0](https://www.commonwl.org/v1.0/Workflow.html),
7+
[CWL v1.1](https://www.commonwl.org/v1.1/Workflow.html),
8+
and [CWL v1.2](https://www.commonwl.org/v1.2/Workflow.html).

run_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Note:
3636
Example: RUNNER=cwltool EXTRA=--enable-dev
3737
EOF
3838

39-
CWL_VER=v1.2
39+
CWL_VER=v1.3.0-dev1
4040
TEST_n=""
4141
TEST_N=""
4242
TEST_s=""

0 commit comments

Comments
 (0)