diff --git a/CHANGELOG.md b/CHANGELOG.md index 470e61b754090b62f2d4289f1ecc66959dc91d2f..8e102e29d19b82b198f45516ae8b781f62086a4b 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 output, and add config file creation to the TALON task. + Removed unused inputs (trimPrimer and format) for cutadapt. + Various minor command tweaks to increase stability. + Fixed unused inputs in bedtools sort (inputs are now used). diff --git a/common.wdl b/common.wdl index 0aba0aef8ffca547f1e46771031584d0c8a449e9..f8b2cd8b9dc6aa180c4624927c651fbfea74c851 100644 --- a/common.wdl +++ b/common.wdl @@ -163,7 +163,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 af98ed61c92b1c0bdf39fc6cb80ba7b017031e50..e2395cb782158fe4398d1e7b5ca5011cda27b9b5 100644 --- a/talon.wdl +++ b/talon.wdl @@ -446,39 +446,44 @@ task SummarizeDatasets { task Talon { input { - File SAMfile - File configFile + Array[File] SAMfiles + String organism + String sequencingPlatform = "PacBio-RS-II" File databaseFile String genomeBuild Float minimumCoverage = 0.9 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" } - command { + command <<< set -e mkdir -p "$(dirname ~{outputPrefix})" - mv ${configFile} ./${configFileName} - mv ${SAMfile} ./${SAMfileName} + export TMPDIR=/tmp + for file in ~{sep=" " SAMfiles} + do + configFileLine="$(basename ${file%.*}),~{organism},~{sequencingPlatform},${file}" + echo ${configFileLine} >> ~{outputPrefix}/talonConfigFile.csv + done talon \ - ~{"--f " + configFileName} \ + ~{"--f " + outputPrefix + "/talonConfigFile.csv"} \ ~{"--db " + databaseFile} \ ~{"--build " + genomeBuild} \ ~{"--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" + File outputConfigFile = outputPrefix + "/talonConfigFile.csv" } runtime { @@ -488,12 +493,16 @@ task Talon { } parameter_meta { - SAMfile: { - description: "Input SAM file, same one as described in configFile.", + SAMfiles: { + description: "Input SAM files.", + category: "required" + } + organism: { + description: "The name of the organism from which the samples originated.", category: "required" } - configFile: { - description: "Dataset config file (comma-delimited).", + sequencingPlatform: { + description: "The sequencing platform used to generate long reads.", category: "required" } databaseFile: { @@ -524,5 +533,13 @@ task Talon { description: "Log file from TALON run.", category: "required" } + outputAnnot: { + description: "Read annotation file from TALON run.", + category: "required" + } + outputConfigFile: { + description: "The TALON configuration file.", + category: "required" + } } }