diff --git a/CHANGELOG.md b/CHANGELOG.md index 637e6d9146d8d9e0904825f96b3af22f8b72d717..9eb41cc45cd4314c16a8b1c4fc75293ad5129a57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # v2.0.0 **User Facing** * Endness metadata "Single Read" changed to "Single End" in data-hub, pipeline updated to handle (#110) ("Single Read" still acceptable for backwards compatibility) +* Strandedness metadata "yes"/"no" changed to boolean "t"/"f" in data-hub, pipeline updated to handle (#70) ("yes"/"no" still acceptable for backwards compatibility) **Background** * Add memory limit (75%) per thread for samtools sort (#108) diff --git a/workflow/rna-seq.nf b/workflow/rna-seq.nf index bce0d20267d6c5b28455c98d95ba24188abdba17..57ec3acdf84f7ced16ea091483ee0cf64ecedf5f 100644 --- a/workflow/rna-seq.nf +++ b/workflow/rna-seq.nf @@ -367,8 +367,27 @@ process parseMetadata { echo -e "LOG: strandedness metadata parsed: \${stranded}" >> ${repRID}.parseMetadata.log # get spike-in metadata - spike=\$(python3 ${script_parseMeta} -r ${repRID} -m "${experimentSettings}" -p spike) + v=\$(python3 ${script_parseMeta} -r ${repRID} -m "${experimentSettings}" -p spike) echo -e "LOG: spike-in metadata parsed: \${spike}" >> ${repRID}.parseMetadata.log + if [ "\${spike}" == "f" ] + then + spike="false" + elif [ "\${spike}" == "t" ] + then + spike="true" + elseif [ "\${spike}" == "no" ] + # "yes"/"no" depreciated as of Jan 2021, this option is present for backwards compatibility + then + spike="false" + elseif [ "\${spike}" == "yes" ] + # "yes"/"no" depreciated as of Jan 2021, this option is present for backwards compatibility + then + spike="true" + elif [ "\${spike}" == "nan" ] + then + endsRaw="_No value_" + endsMeta="NA" + fi # get species metadata species=\$(python3 ${script_parseMeta} -r ${repRID} -m "${experiment}" -p species) @@ -935,9 +954,9 @@ process inferMetadata { # determine spike-in if [ 1 -eq \$(echo \$(expr \${align_ercc} ">=" 10)) ] then - spike="yes" + spike="true" else - spike="no" + spike="false" fi echo -e "LOG: inference of strandedness results is: \${spike}" >> ${repRID}.inferMetadata.log diff --git a/workflow/scripts/parse_meta.py b/workflow/scripts/parse_meta.py index fdbc86c12a2fb6832217ec0f08263d0102c9e566..b5379bb189ec5f88c0353fa54e2fdb163d7d22ba 100644 --- a/workflow/scripts/parse_meta.py +++ b/workflow/scripts/parse_meta.py @@ -73,12 +73,7 @@ def main(): # Get spike-in metadata from 'Experiment Settings.csv' if (args.parameter == "spike"): - if (metaFile.Used_Spike_Ins.unique() == "yes"): - spike = "yes" - elif (metaFile.Used_Spike_Ins.unique() == "no"): - spike = "no" - else: - spike = metaFile.Used_Spike_Ins.unique()[0] + spike = metaFile.Used_Spike_Ins.unique()[0] print(spike) # Get species metadata from 'Experiment.csv'