Skip to content

Commit

Permalink
Merge pull request #47 from common-workflow-language/stable-release
Browse files Browse the repository at this point in the history
Approve CWL v1.2 stable release
  • Loading branch information
mr-c authored Aug 7, 2020
2 parents 729bb8d + 317dce2 commit bfe4075
Show file tree
Hide file tree
Showing 300 changed files with 320 additions and 324 deletions.
16 changes: 8 additions & 8 deletions CommandLineTool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ $graph:
type: documentation
doc:
- |
# Common Workflow Language (CWL) Command Line Tool Description, v1.2.0-dev5
# Common Workflow Language (CWL) Command Line Tool Description, v1.2
This version:
* https://w3id.org/cwl/v1.2.0-dev5/
* https://w3id.org/cwl/v1.2/
Latest stable version:
* https://w3id.org/cwl/
Expand All @@ -37,17 +37,17 @@ $graph:
- {$include: intro.md}

- |
## Introduction to the CWL Command Line Tool standard v1.2.0-dev5
## Introduction to the CWL Command Line Tool standard v1.2
This specification represents the latest development release from the
CWL group. Since the v1.1 release, v1.2.0-dev5 introduces the
CWL group. Since the v1.1 release, v1.2 introduces the
following updates to the CWL Command Line Tool standard.
Documents should use `cwlVersion: v1.2.0-dev5` to make use of new
syntax and features introduced in v1.2.0-dev5. Existing v1.1 documents
Documents should use `cwlVersion: v1.2` to make use of new
syntax and features introduced in v1.2. Existing v1.1 documents
should be trivially updatable by changing `cwlVersion`, however
CWL documents that relied on previously undefined or
underspecified behavior may have slightly different behavior in
v1.2.0-dev5.
v1.2.
## Changelog
Expand Down Expand Up @@ -81,7 +81,7 @@ $graph:
running in containers.
* Specify default success/fail interpretation of exit codes when not given.
See also the [CWL Workflow Description, v1.2.0-dev5 changelog](Workflow.html#Changelog).
See also the [CWL Workflow Description, v1.2 changelog](Workflow.html#Changelog).
For other changes since CWL v1.0, see the
[CWL Command Line Tool Description, v1.1 changelog](https://www.commonwl.org/v1.1/CommandLineTool.html#Changelog)
Expand Down
3 changes: 2 additions & 1 deletion Process.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $namespaces:

$graph:

- name: "Common Workflow Language, v1.2.0-dev5"
- name: "Common Workflow Language, v1.2"
type: documentation
doc: {$include: concepts.md}

Expand Down Expand Up @@ -45,6 +45,7 @@ $graph:
- cwl:v1.2.0-dev3
- cwl:v1.2.0-dev4
- cwl:v1.2.0-dev5
- cwl:v1.2

- name: CWLType
type: enum
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Hello!

This repo holds the unreleased v1.2 of the Common Workflow Language standard and the history of its development.
This repo holds the released v1.2 of the Common Workflow Language standard and the history of its development.

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

You may browse the spec online at https://www.commonwl.org/v1.2.0-dev5
You may browse the spec online at https://www.commonwl.org/v1.2
16 changes: 8 additions & 8 deletions Workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ $graph:
type: documentation
doc:
- |
# Common Workflow Language (CWL) Workflow Description, v1.2.0-dev5
# Common Workflow Language (CWL) Workflow Description, v1.2
This version:
* https://w3id.org/cwl/v1.2.0-dev5/
* https://w3id.org/cwl/v1.2/
Latest stable version:
* https://w3id.org/cwl/
Expand All @@ -35,17 +35,17 @@ $graph:

- |
## Introduction to CWL Workflow standard v1.2.0-dev5
## Introduction to CWL Workflow standard v1.2
This specification represents the latest stable release from the
CWL group. Since the v1.1 release, v1.2.0-dev5 introduces the
CWL group. Since the v1.1 release, v1.2 introduces the
following updates to the CWL Workflow standard.
Documents should to use `cwlVersion: v1.2.0-dev5` to make use of new
syntax and features introduced in v1.2.0-dev5. Existing v1.1 documents
Documents should to use `cwlVersion: v1.2` to make use of new
syntax and features introduced in v1.2. Existing v1.1 documents
should be trivially updatable by changing `cwlVersion`, however
CWL documents that relied on previously undefined or
underspecified behavior may have slightly different behavior in
v1.2.0-dev5.
v1.2.
## Changelog
Expand All @@ -72,7 +72,7 @@ $graph:
* Added discussion about handling different document versions.
* Added definition of **data link**
See also the [CWL Command Line Tool Description, v1.2.0-dev5 changelog](CommandLineTool.html#Changelog).
See also the [CWL Command Line Tool Description, v1.2 changelog](CommandLineTool.html#Changelog).
For other changes since CWL v1.0, see the
[CWL Workflow Description, v1.1 changelog](https://www.commonwl.org/v1.1/Workflow.html#Changelog)
Expand Down
9 changes: 2 additions & 7 deletions contrib.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,12 @@ Contributors to v1.2:

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).

This specification is a draft, and has not yet been approved as an official CWL standard.

<!-- v1.2.0-devN is not yet approvied
This specification was [approved on 6 June 2019](https://github.com/common-workflow-language/common-workflow-language/issues/861) by the CWL leadership team consisting of:
This specification was [approved on XXX August 2020](https://github.com/common-workflow-language/cwl-v1.2/XXX) by the CWL leadership team consisting of:

* Peter Amstutz, Curii Inc. / Arvados; https://orcid.org/0000-0003-3566-7705
* John Chilton, Pennsylvania State University / Galaxy Project; https://orcid.org/0000-0002-6794-0756
* Michael R. Crusoe, CWL Project Lead; https://orcid.org/0000-0002-2961-9670
* Brandi Davis Dusenbery, Seven Bridges Genomics, Inc.; https://orcid.org/0000-0001-7811-8613
* Jeff Gentry, Broad Institute; https://orcid.org/0000-0001-5351-8442
* Jeff Gentry, Foundation Medicine; https://orcid.org/0000-0001-5351-8442
* Hervé Ménager, Institut Pasteur; https://orcid.org/0000-0002-7552-1009
* Stian Soiland-Reyes, University of Manchester; https://orcid.org/0000-0001-9842-9718
-->
2 changes: 1 addition & 1 deletion cwl-runner.cwl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env cwl-runner
class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2

doc: |
Generic interface to run a Common Workflow Language tool or workflow from the
Expand Down
4 changes: 2 additions & 2 deletions index.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Common Workflow Language Specifications, v1.2.0-dev5
# Common Workflow Language Specifications, v1.2

The CWL specifications are divided up into several documents.

The [User Guide](http://www.commonwl.org/user_guide/) provides a gentle
introduction to writing CWL command line tools and workflows. Currently it is for CWL v1.0 only.
introduction to writing CWL command line tools and workflows. Currently it covers CWL v1.0 only.

The [Command Line Tool Description Specification](CommandLineTool.html)
specifies the document schema and execution semantics for wrapping and
Expand Down
2 changes: 1 addition & 1 deletion tests/anon_enum_inside_array.cwl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
class: CommandLineTool
inputs:
first:
Expand Down
2 changes: 1 addition & 1 deletion tests/anon_enum_inside_array_inside_schemadef.cwl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
class: CommandLineTool
requirements:
SchemaDefRequirement:
Expand Down
2 changes: 1 addition & 1 deletion tests/any-type-compat.cwl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
class: Workflow

steps: []
Expand Down
2 changes: 1 addition & 1 deletion tests/basename-fields-job.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
tool:
class: File
path: echo-tool.cwl # could have been any file, this isn't a secret CWL feature :-)
2 changes: 1 addition & 1 deletion tests/basename-fields-test.cwl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
class: Workflow

requirements:
Expand Down
2 changes: 1 addition & 1 deletion tests/binding-test.cwl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env cwl-runner

class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
hints:
- class: DockerRequirement
dockerPull: python:2-slim
Expand Down
2 changes: 1 addition & 1 deletion tests/bool-empty-inputbinding.cwl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env cwl-runner
class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
hints:
- class: DockerRequirement
dockerPull: python:2-slim
Expand Down
2 changes: 1 addition & 1 deletion tests/bwa-mem-tool.cwl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env cwl-runner

cwlVersion: v1.2.0-dev5
cwlVersion: v1.2

class: CommandLineTool

Expand Down
2 changes: 1 addition & 1 deletion tests/cat-from-dir.cwl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env cwl-runner

class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2

inputs:
dir1: Directory
Expand Down
2 changes: 1 addition & 1 deletion tests/cat-tool-shortcut.cwl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env cwl-runner

class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2

requirements:
- class: DockerRequirement
Expand Down
2 changes: 1 addition & 1 deletion tests/cat-tool.cwl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env cwl-runner

class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2

inputs:
file1: File
Expand Down
2 changes: 1 addition & 1 deletion tests/cat1-testcli.cwl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env cwl-runner
{
"class": "CommandLineTool",
"cwlVersion": "v1.2.0-dev5",
"cwlVersion": "v1.2",
"doc": "Print the contents of a file to stdout using 'cat' running in a docker container.",
"hints": [
{
Expand Down
2 changes: 1 addition & 1 deletion tests/cat3-from-dir.cwl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env cwl-runner
class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
inputs:
dir1:
type: Directory
Expand Down
2 changes: 1 addition & 1 deletion tests/cat3-nodocker.cwl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env cwl-runner
class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
doc: "Print the contents of a file to stdout using 'cat'."
inputs:
file1:
Expand Down
2 changes: 1 addition & 1 deletion tests/cat3-tool-docker.cwl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env cwl-runner
class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
doc: "Print the contents of a file to stdout using 'cat' running in a docker container."
requirements:
DockerRequirement:
Expand Down
2 changes: 1 addition & 1 deletion tests/cat3-tool-mediumcut.cwl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env cwl-runner
class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
doc: "Print the contents of a file to stdout using 'cat' running in a docker container."
requirements:
DockerRequirement:
Expand Down
2 changes: 1 addition & 1 deletion tests/cat3-tool-shortcut.cwl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env cwl-runner
class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
doc: "Print the contents of a file to stdout using 'cat' running in a docker container."
requirements:
DockerRequirement:
Expand Down
2 changes: 1 addition & 1 deletion tests/cat3-tool.cwl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env cwl-runner
class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
doc: "Print the contents of a file to stdout using 'cat' running in a docker container."
hints:
DockerRequirement:
Expand Down
2 changes: 1 addition & 1 deletion tests/cat4-tool.cwl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env cwl-runner
class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
doc: "Print the contents of a file to stdout using 'cat' running in a docker container if docker is available."
hints:
DockerRequirement:
Expand Down
2 changes: 1 addition & 1 deletion tests/cat5-tool.cwl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env cwl-runner
$namespaces:
ex: http://example.com/
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
class: CommandLineTool
doc: "Print the contents of a file to stdout using 'cat' running in a docker container."
hints:
Expand Down
2 changes: 1 addition & 1 deletion tests/conditionals/action.cwl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env cwl-runner
class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
inputs:
initial_file: File
out_file_name: string
Expand Down
2 changes: 1 addition & 1 deletion tests/conditionals/bar.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
inputs:
in1: int
baseCommand: [echo]
Expand Down
2 changes: 1 addition & 1 deletion tests/conditionals/cat.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
inputs:
in1: int
in2: int
Expand Down
2 changes: 1 addition & 1 deletion tests/conditionals/cond-wf-001.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class: Workflow
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
inputs:
val: int

Expand Down
2 changes: 1 addition & 1 deletion tests/conditionals/cond-wf-001_nojs.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class: Workflow
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
inputs:
test: boolean

Expand Down
2 changes: 1 addition & 1 deletion tests/conditionals/cond-wf-002.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class: Workflow
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
inputs:
val: int

Expand Down
2 changes: 1 addition & 1 deletion tests/conditionals/cond-wf-002_nojs.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class: Workflow
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
inputs:
val: int
test:
Expand Down
2 changes: 1 addition & 1 deletion tests/conditionals/cond-wf-003.1.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class: Workflow
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
inputs:
val: int

Expand Down
2 changes: 1 addition & 1 deletion tests/conditionals/cond-wf-003.1_nojs.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class: Workflow
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
inputs:
val:
type: int
Expand Down
2 changes: 1 addition & 1 deletion tests/conditionals/cond-wf-003.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class: Workflow
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
inputs:
val: int
def:
Expand Down
2 changes: 1 addition & 1 deletion tests/conditionals/cond-wf-003_nojs.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class: Workflow
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
inputs:
val:
type: int
Expand Down
2 changes: 1 addition & 1 deletion tests/conditionals/cond-wf-004.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class: Workflow
cwlVersion: v1.2.0-dev5
cwlVersion: v1.2
inputs:
val: int
def:
Expand Down
Loading

0 comments on commit bfe4075

Please sign in to comment.