diff --git a/metagenomics.py b/metagenomics.py index 3eb1701a6..081a5a9fd 100755 --- a/metagenomics.py +++ b/metagenomics.py @@ -821,7 +821,7 @@ def krona(inReport, db, outHtml, queryColumn=None, taxidColumn=None, scoreColumn if 'score' in line: line = line.replace('Avg. score', 'Est. unique kmers') print(line, file=new_report) - os.rename(fn, outHtml) + shutil.copyfile(fn, outHtml) return elif inputType == 'kaiju': kaiju = tools.kaiju.Kaiju() diff --git a/pipes/WDL/workflows/tasks/tasks_demux.wdl b/pipes/WDL/workflows/tasks/tasks_demux.wdl index d73cf81fe..5d767f40a 100644 --- a/pipes/WDL/workflows/tasks/tasks_demux.wdl +++ b/pipes/WDL/workflows/tasks/tasks_demux.wdl @@ -49,9 +49,9 @@ task illumina_demux { Boolean? forceGC=true - parameter_meta { - flowcell_tgz : "stream" # for DNAnexus, until WDL implements the File| type - } +# parameter_meta { +# flowcell_tgz : "stream" # for DNAnexus, until WDL implements the File| type +# } command { set -ex -o pipefail diff --git a/pipes/WDL/workflows/tasks/tasks_metagenomics.wdl b/pipes/WDL/workflows/tasks/tasks_metagenomics.wdl index abd6a5ee8..89b8b0a41 100644 --- a/pipes/WDL/workflows/tasks/tasks_metagenomics.wdl +++ b/pipes/WDL/workflows/tasks/tasks_metagenomics.wdl @@ -3,11 +3,11 @@ task krakenuniq { File krakenuniq_db_tar_lz4 # krakenuniq/{database.kdb,taxonomy} File krona_taxonomy_db_tgz # taxonomy/taxonomy.tab - parameter_meta { - krakenuniq_db_tar_lz4: "stream" # for DNAnexus, until WDL implements the File| type - krona_taxonomy_db_tgz : "stream" # for DNAnexus, until WDL implements the File| type - reads_unmapped_bam: "stream" # for DNAnexus, until WDL implements the File| type - } +# parameter_meta { +# krakenuniq_db_tar_lz4: "stream" # for DNAnexus, until WDL implements the File| type +# krona_taxonomy_db_tgz : "stream" # for DNAnexus, until WDL implements the File| type +# reads_unmapped_bam: "stream" # for DNAnexus, until WDL implements the File| type +# } command { set -ex -o pipefail @@ -79,9 +79,9 @@ task krona { String input_basename = basename(classified_reads_txt_gz, ".txt.gz") - parameter_meta { - krona_taxonomy_db_tgz : "stream" # for DNAnexus, until WDL implements the File| type - } +# parameter_meta { +# krona_taxonomy_db_tgz : "stream" # for DNAnexus, until WDL implements the File| type +# } command { set -ex -o pipefail @@ -122,9 +122,9 @@ task filter_bam_to_taxa { String input_basename = basename(classified_bam, ".bam") - parameter_meta { - ncbi_taxonomy_db_tgz : "stream" # for DNAnexus, until WDL implements the File| type - } +# parameter_meta { +# ncbi_taxonomy_db_tgz : "stream" # for DNAnexus, until WDL implements the File| type +# } command { set -ex -o pipefail @@ -179,11 +179,11 @@ task kaiju { String input_basename = basename(reads_unmapped_bam, ".bam") - parameter_meta { - kaiju_db_lz4 : "stream" # for DNAnexus, until WDL implements the File| type - ncbi_taxonomy_db_tgz : "stream" - krona_taxonomy_db_tgz : "stream" - } +# parameter_meta { +# kaiju_db_lz4 : "stream" # for DNAnexus, until WDL implements the File| type +# ncbi_taxonomy_db_tgz : "stream" +# krona_taxonomy_db_tgz : "stream" +# } command { set -ex -o pipefail diff --git a/tools/krona.py b/tools/krona.py index 43e416de2..0cc586fe9 100644 --- a/tools/krona.py +++ b/tools/krona.py @@ -5,7 +5,7 @@ from builtins import super TOOL_NAME = 'krona' -CONDA_TOOL_VERSION = '2.7' +CONDA_TOOL_VERSION = '2.7.1' class Krona(tools.Tool):