diff --git a/CHANGELOG.md b/CHANGELOG.md index 09418cc8bcc938212efa6ca434cd342021dc1649..ebe58ea58f23ce7e0cbade8194b580ed0b55a3b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ that users understand how the changes affect the new version. version 2.2.0-dev --------------------------- ++ Update biowdl-input-converter in common.wdl to version 0.2.1. ++ Update TALON section to now include the new annotation file. + Update TALON default image to version 4.4.1. version 2.1.0 diff --git a/common.wdl b/common.wdl index dccac8567286527079f24378f3f576b7c31914ac..21227e4f2d92340d152a44fdcae339f9a51a333f 100644 --- a/common.wdl +++ b/common.wdl @@ -162,7 +162,7 @@ task YamlToJson { File yaml String outputJson = basename(yaml, "\.ya?ml$") + ".json" # biowdl-input-converter has python and pyyaml. - String dockerImage = "quay.io/biocontainers/biowdl-input-converter:0.2.0--py_0" + String dockerImage = "quay.io/biocontainers/biowdl-input-converter:0.2.1--py_0" } command { set -e diff --git a/talon.wdl b/talon.wdl index 9c426e55bbeede608afd9e0640c5b40f2e4a4d9a..e350d13cbc52f0bc65f0eafdd6509c4050b79f42 100644 --- a/talon.wdl +++ b/talon.wdl @@ -446,7 +446,6 @@ task SummarizeDatasets { task Talon { input { - File SAMfile File configFile File databaseFile String genomeBuild @@ -454,10 +453,9 @@ task Talon { Int minimumIdentity = 0 String outputPrefix String configFileName = basename(configFile) - String SAMfileName = basename(SAMfile) Int cores = 4 - String memory = "20G" + String memory = "25G" String dockerImage = "biocontainers/talon:v4.4.1_cv1" } @@ -465,7 +463,7 @@ task Talon { set -e mkdir -p $(dirname ~{outputPrefix}) mv ${configFile} ./${configFileName} - mv ${SAMfile} ./${SAMfileName} + export TMPDIR=/tmp talon \ ~{"--f " + configFileName} \ ~{"--db " + databaseFile} \ @@ -473,12 +471,13 @@ task Talon { ~{"--threads " + cores} \ ~{"--cov " + minimumCoverage} \ ~{"--identity " + minimumIdentity} \ - ~{"--o " + outputPrefix} + ~{"--o " + outputPrefix + "/run"} } output { File outputUpdatedDatabase = databaseFile - File outputLog = outputPrefix + "_talon_QC.log" + File outputLog = outputPrefix + "/run_QC.log" + File outputAnnot = outputPrefix + "/run_talon_read_annot.tsv" } runtime { @@ -488,10 +487,6 @@ task Talon { } parameter_meta { - SAMfile: { - description: "Input SAM file, same one as described in configFile.", - category: "required" - } configFile: { description: "Dataset config file (comma-delimited).", category: "required" @@ -524,5 +519,9 @@ task Talon { description: "Log file from TALON run.", category: "required" } + outputAnnot: { + description: "Read annotation file from TALON run.", + category: "required" + } } }