Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 1.1 Spec #428

Merged
merged 111 commits into from
Jan 29, 2021
Merged
Changes from 1 commit
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
b526c86
Regular expression evaluation should be fixed.
rhpvorderman Aug 10, 2018
a7ba3e8
change perl to posix
rhpvorderman Aug 20, 2018
1413daa
remove redundant escape character
rhpvorderman Sep 13, 2018
8e91963
add examples
rhpvorderman Sep 13, 2018
84b9a7a
Defined Struct literals
patmagee Dec 14, 2018
34e8306
Made struct literals more Pythonic
patmagee Jan 18, 2019
fc0d0c5
fixed example for struct literal
patmagee Jan 18, 2019
bef5343
Removed references to object literal
patmagee Feb 13, 2019
c400329
Fixed typos
patmagee Mar 27, 2019
507ba47
Fixed more spelling errors
patmagee Mar 27, 2019
663d592
- add min, max to list of standard library methods
pshapiro4broad Apr 3, 2019
ff4f8b7
min, max can accept both Float and/or Int
pshapiro4broad Apr 4, 2019
3292bff
english
pshapiro4broad Apr 4, 2019
6454db1
Changed Struct literal notation
patmagee Apr 16, 2019
ed70e06
Add section on file outputs including optional outputs
jtratner Apr 21, 2019
9acf43e
Added hints and clarified runtime section
patmagee May 31, 2019
80528ad
Merge branch 'master' of https://github.com/OpenWDL/wdl into hints-an…
patmagee May 31, 2019
9862318
Fixed spelling mistakes
patmagee May 31, 2019
c47ff8e
Minor fixes
patmagee May 31, 2019
0a382c4
Added default definitions for runtime values
patmagee Jun 5, 2019
86f7a87
Spelling fixes
patmagee Jun 5, 2019
8a69446
fixed copy paste error
patmagee Jun 6, 2019
7b8d532
Folded in changes from #313
patmagee Jul 19, 2019
1850a2f
Update SPEC.md
jtratner Aug 12, 2019
e11018a
Update versions/1.0/SPEC.md
jtratner Aug 12, 2019
e59f111
clarify subworkflow namespacing
DavyCats Nov 8, 2019
37d76ab
typo
DavyCats Nov 8, 2019
c69e712
further clarification on namespace, allow cromwell style namespacing
DavyCats Nov 19, 2019
2bfa0d5
@mlin's suggestion
DavyCats Nov 21, 2019
2664526
Rewrite the namespaces section
DavyCats Dec 4, 2019
d43592b
remove redundant line
DavyCats Dec 4, 2019
10b055e
lift requirement for all workflow inputs to be filled
rhpvorderman Dec 11, 2019
dcbfafa
address @davycats review comments
rhpvorderman Dec 11, 2019
61188fc
Remove backwards compatability with bug
DavyCats Jan 6, 2020
ecd270d
encourage filling in required inputs for tasks
rhpvorderman Jan 28, 2020
6ba8da5
Merge branch 'reworkinputs' of github.com:/rhpvorderman/wdl into rewo…
rhpvorderman Jan 28, 2020
60fcf59
Integrate cjllanwarne's proposal
rhpvorderman Feb 6, 2020
134f090
remove redundant new line
rhpvorderman Feb 6, 2020
549eed6
better wording
rhpvorderman Feb 6, 2020
2d19af2
require required inputs
rhpvorderman Mar 6, 2020
583e0a8
update example
rhpvorderman Mar 6, 2020
9bd28ac
Apply suggestions from code review
rhpvorderman Mar 11, 2020
1e28d58
add allowNestedInputs
rhpvorderman Mar 11, 2020
cd69299
Merge remote-tracking branch 'remotes/upstream/master' into optionali…
rhpvorderman May 4, 2020
53daafa
update changelog
rhpvorderman May 4, 2020
0e95a27
Merge branch 'optionalinputs' of github.com:rhpvorderman/wdl into opt…
rhpvorderman May 4, 2020
addd64f
Merge branch 'master' into optionalinputs
rhpvorderman May 22, 2020
cd672b7
Merge branch 'master' into optionalinputs
rhpvorderman Jun 25, 2020
653efbe
Typo
rhpvorderman Jul 9, 2020
561b809
Merge remote-tracking branch 'upstream/main' into subworkflow_namespace
DavyCats Nov 4, 2020
b329063
add links to relevant sections
DavyCats Nov 4, 2020
138b469
Better period placement.
rhpvorderman Nov 10, 2020
435469a
Merge remote-tracking branch 'rhpvorderman/patch-1' into v1.1
jdidion Nov 29, 2020
73b21fd
merge struct-literal
jdidion Nov 29, 2020
76c4234
merge min/max
jdidion Nov 29, 2020
9b5e664
Merge remote-tracking branch 'jtratner/optional-outputs' into v1.1
jdidion Nov 29, 2020
5a1edfb
Revert "Merge remote-tracking branch 'jtratner/optional-outputs' into…
jdidion Nov 29, 2020
c164ea0
merge min/max
jdidion Nov 29, 2020
9c0e344
merge
jdidion Nov 29, 2020
9eda914
merge file-outputs
jdidion Nov 30, 2020
ed3f513
merge hints-and-runtime
jdidion Nov 30, 2020
52501d1
merge subworkflow_namespace
jdidion Nov 30, 2020
000036c
merge optionalinputs
jdidion Nov 30, 2020
791ddb0
Initial commit of v1.1
jdidion Dec 10, 2020
b50b916
merge changelog
jdidion Dec 10, 2020
0f171ee
revert changes to development
jdidion Dec 10, 2020
377cb39
fix emojis
jdidion Dec 10, 2020
592d4db
fix formatting
jdidion Dec 10, 2020
ce72000
fix coercion table
jdidion Dec 10, 2020
dfaebff
add link, fix glob restriction
jdidion Dec 10, 2020
0d9659d
fix operator table
jdidion Dec 10, 2020
ef1e237
add template wf to top of wf section
jdidion Dec 10, 2020
a242896
fix term
jdidion Dec 10, 2020
46219b0
fix quoting
jdidion Dec 10, 2020
be0082e
fix example
jdidion Dec 10, 2020
6260152
fixes
jdidion Dec 10, 2020
55ebaa2
move most changes in changelog from 2.0.0 to 1.1.0
jdidion Dec 15, 2020
82f7864
make changes suggested by @rhpvorderman
jdidion Dec 16, 2020
97e8141
clarifications to Task Exectuion
jdidion Dec 16, 2020
682c356
prefer using ~{} in examples
jdidion Dec 16, 2020
bd44cc7
typos
jdidion Dec 16, 2020
ab3579a
dropping the line about 80 character limit until a consensus is reach…
jdidion Dec 16, 2020
0bcc93c
revise intro
jdidion Dec 16, 2020
b03ca8a
make all examples valid and consistent
jdidion Dec 17, 2020
ea2158e
make changes suggested by @vortexing
jdidion Dec 18, 2020
5a8c420
fix table
jdidion Dec 18, 2020
5d9a8ed
fix table
jdidion Dec 18, 2020
aaf8838
fix table
jdidion Dec 18, 2020
7be9bdd
fix table
jdidion Dec 18, 2020
9dc542d
clarify line endings in read_* and write_*; other cleanup
jdidion Dec 18, 2020
359fc85
add caution about deserilaizing Map from JSON
jdidion Dec 18, 2020
977408d
add clarification about read_string
jdidion Dec 18, 2020
130dc6b
Update ImplementationGuide.md
jdidion Dec 21, 2020
6b21e35
Update ImplementationGuide.md
jdidion Dec 21, 2020
9cf602e
Update ImplementationGuide.md
jdidion Dec 21, 2020
f933f49
Update ImplementationGuide.md
jdidion Dec 21, 2020
468a3aa
Update ImplementationGuide.md
jdidion Dec 21, 2020
7fd2b2a
Update ImplementationGuide.md
jdidion Dec 21, 2020
58b4238
Update ImplementationGuide.md
jdidion Dec 21, 2020
3c50cad
Update versions/1.1/SPEC.md
jdidion Jan 6, 2021
6044cf6
Update versions/1.1/SPEC.md
jdidion Jan 12, 2021
f8bff54
Update versions/1.1/SPEC.md
jdidion Jan 12, 2021
6383411
fix typo
jdidion Jan 14, 2021
0edbaef
clarify that regexp strings need to use double-escaping of escape seq…
jdidion Jan 14, 2021
01d1b68
add list of changes from 1.0 -> 1.1
jdidion Jan 14, 2021
3d678a4
typo
jdidion Jan 14, 2021
f0e9292
mark parser changes
jdidion Jan 14, 2021
e64c1e4
add references for 1.1 and development
jdidion Jan 14, 2021
7e19d1f
add back in and deprecate string concatenation and boolean comparison…
jdidion Jan 15, 2021
9f21c3f
remove regexp option for basename function
jdidion Jan 27, 2021
b4019e8
clarify that expression placeholders cannot be combined
jdidion Jan 27, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
min, max can accept both Float and/or Int
- specify type behavior when types are mixed
- update example to show mixed type behavior
  • Loading branch information
pshapiro4broad committed Apr 4, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit ff4f8b77cc2937588477468ee2d56b042ec74784
13 changes: 8 additions & 5 deletions versions/development/SPEC.md
Original file line number Diff line number Diff line change
@@ -130,7 +130,7 @@ Table of Contents
* [Boolean defined(X?)](#boolean-definedx)
* [String basename(String)](#string-basenamestring)
* [Int floor(Float), Int ceil(Float) and Int round(Float)](#int-floorfloat-int-ceilfloat-and-int-roundfloat)
* [Int min(Int, Int) and Int max(Int, Int)](#int-minintint-int-maxintint)
* [X min(Y, Z) and X max(Y, Z)](#x-minyz-x-maxyz)
* [Data Types & Serialization](#data-types--serialization)
* [Serialization of Task Inputs](#serialization-of-task-inputs)
* [Primitive Types](#primitive-types)
@@ -3183,7 +3183,7 @@ This function will return `false` if the argument is an unset optional value. It
- ceil: Round **up** to the next higher integer
- round: Round to the nearest integer based on standard rounding rules

## Int min(Int, Int) and Int max(Int, Int)
## X min(Y, Z) and X max(Y, Z)

The function `min` returns the smaller of its two arguments and the function `max` returns the larger of its two
arguments. They are shorthand for writing an `if` expression. For example,
@@ -3193,16 +3193,19 @@ version 1.0
workflow Max {
input {
Int value1
Int value2
Float value2
}

output {
Int max1 = if value1 > value2 then value1 else value2
Int max2 = max(value1, value2)
Float max1 = if value1 > value2 then value1 else value2
Float max2 = max(value1, value2)
}
}
```

These functions can accept any combination of `Int` and `Float` arguments. If both arguments are type `Int`, than the
result is type `Int`, otherwise the result is type `Float`.

# Data Types & Serialization

Tasks and workflows are given values for their input parameters in order to run. The type of each of those input parameters are declarations on the `task` or `workflow`. Those input parameters can be any [valid type](#types):