Skip to content

Commit b6553a9

Browse files
mr-cmr-c
committed
Merge commit '362cca3a90d24209abc77c5419b7f8d789de379a'
2 parents 3c950c9 + 362cca3 commit b6553a9

Some content is hidden

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

47 files changed

+691
-232
lines changed

‎cwltool/schemas/CITATION

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
To cite the Common Workflow Language standard in a publication, please use:
22

3-
Amstutz, Peter; Andeer, Robin; Chapman, Brad; Chilton, John; Crusoe, Michael
4-
R.; Valls Guimerà, Roman; Carrasco Hernandez, Guillermo; Ivkovic, Sinisa;
5-
Kartashov, Andrey; Kern, John; Leehr, Dan; Ménager, Hervé; Mikheev, Maxim;
6-
Pierce, Tim; Randall, Josh; Soiland-Reyes, Stian; Stojanovic, Luka; Tijanić,
7-
Nebojša (2016): Common Workflow Language, draft 3. figshare.
8-
https://dx.doi.org/10.6084/m9.figshare.3115156.v1
3+
Amstutz, Peter; Crusoe, Michael R; Tijanić, Nebojša; Chapman, Brad;
4+
Chilton, John; Heuer, Michael; Kartashov, Andrey; Kern, John; Leehr, Dan;
5+
Ménager, Hervé; Nedeljkovich, Maya; Scales, Matt; Soiland-Reyes, Stian;
6+
Stojanovic, Luka (2016): Common Workflow Language, v1.0. figshare.
7+
https://dx.doi.org/10.6084/m9.figshare.3115156.v2
98

109
@data{common-workflow-language-draft3,
11-
doi = {10.6084/m9.figshare.3115156.v1},
12-
url = {http://dx.doi.org/10.6084/m9.figshare.3115156.v1},
13-
author = {Peter Amstutz; Robin Andeer; Brad Chapman; John Chilton;
14-
Michael R. Crusoe; Roman Valls Guimerà; Guillermo Carrasco Hernandez;
15-
Sinisa Ivkovic; Andrey Kartashov; John Kern; Dan Leehr; Hervé Ménager;
16-
Maxim Mikheev; Tim Pierce; Josh Randall; Stian Soiland-Reyes; Luka Stojanovic;
17-
Nebojša Tijanić; },
10+
doi = {10.6084/m9.figshare.3115156.v2},
11+
url = {http://dx.doi.org/10.6084/m9.figshare.3115156.v2},
12+
author = {Peter Amstutz; Michael R. Crusoe; Nebojša Tijanić; Brad Chapman;
13+
John Chilton; Michael Heuer; Andrey Kartashov; John Kern; Dan Leehr;
14+
Hervé Ménager; Maya Nedeljkovich; Matt Scales; Stian Soiland-Reyes;
15+
Luka Stojanovic
16+
},
1817
publisher = {Figshare},
19-
title = {Common Workflow Language, draft 3},
18+
title = {Common Workflow Language, v1.0},
2019
year = {2016}
2120
}

‎cwltool/schemas/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ Bioinformatics, Medical Imaging, Chemistry, Physics, and Astronomy.
1616

1717
## CWL User Guide
1818

19-
[User guide for the current stable specification (draft-3)](http://www.commonwl.org/draft-3/UserGuide.html),
19+
[User guide for the current stable specification (v1.0)](http://www.commonwl.org/v1.0/UserGuide.html),
2020
provides a gentle introduction to writing CWL command line tool and workflow descriptions.
2121

2222
## CWL Specification
2323

2424
The current stable specification is [v1.0](http://www.commonwl.org/v1.0/):
2525

26-
http://www.commonwl.org/draft-v1.0/
26+
http://www.commonwl.org/v1.0/
2727

2828
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/)
2929

3030
### Citation
3131

32-
Please cite https://dx.doi.org/10.6084/m9.figshare.3115156.v1
32+
Please cite https://dx.doi.org/10.6084/m9.figshare.3115156.v2
3333

3434
## Implementations
3535

‎cwltool/schemas/run_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Options:
1111
-l List tests
1212
EOF
1313

14-
DRAFT=draft-3
14+
DRAFT=v1.0
1515
TEST_N=""
1616
RUNNER=cwl-runner
1717
PLATFORM=$(uname -s)

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@
6363
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
6464
"primtype": null
6565
},
66-
#{
67-
# "source": {"$import": "userguide-draft4-input.json"},
68-
# "target": "v1.0/UserGuide.html",
69-
# "renderlist": [],
70-
# "redirect": [],
71-
# "brandlink": "index.html",
72-
# "brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
73-
# "primtype": null
74-
#}
66+
{
67+
"source": {"$import": "userguide-v1.0-input.json"},
68+
"target": "v1.0/UserGuide.html",
69+
"renderlist": [],
70+
"redirect": [],
71+
"brandlink": "index.html",
72+
"brandimg": "<img src='../CWL-Logo-Header.png' style='height: 61px; margin-top: -20px; margin-left: -20px'></img>",
73+
"primtype": null
74+
}
7575

7676
]

‎cwltool/schemas/site/cwlsite.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env cwl-runner
2-
cwlVersion: cwl:v1.0.dev4
2+
cwlVersion: cwl:v1.0
33

44
class: Workflow
55
inputs:

‎cwltool/schemas/site/linkchecker.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class: CommandLineTool
2-
cwlVersion: v1.0.dev4
2+
cwlVersion: v1.0
33
hints:
44
DockerRequirement:
55
dockerFile: |

‎cwltool/schemas/site/makecontext.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cwlVersion: v1.0.dev4
1+
cwlVersion: v1.0
22
class: CommandLineTool
33
inputs:
44
schema:

‎cwltool/schemas/site/makedoc.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cwlVersion: v1.0.dev4
1+
cwlVersion: v1.0
22
class: CommandLineTool
33
requirements:
44
- class: InlineJavascriptRequirement

‎cwltool/schemas/site/makerdfs.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cwlVersion: v1.0.dev4
1+
cwlVersion: v1.0
22
class: CommandLineTool
33
inputs:
44
schema:

‎cwltool/schemas/site/makespec.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cwlVersion: v1.0.dev4
1+
cwlVersion: v1.0
22
class: Workflow
33

44
inputs:

0 commit comments

Comments
 (0)