Skip to content

Commit

Permalink
bump viral-core to 2.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
dpark01 committed Sep 19, 2024
1 parent 42dca48 commit 8b65adc
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions pipes/WDL/tasks/tasks_assembly.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ task align_reads {
Boolean skip_mark_dupes = false
Int? machine_mem_gb
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
String sample_name = basename(basename(basename(reads_unmapped_bam, ".bam"), ".taxfilt"), ".clean")
}
Expand Down Expand Up @@ -981,7 +981,7 @@ task run_discordance {
String out_basename = "run"
Int min_coverage = 4
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
parameter_meta {
reads_aligned_bam: {
Expand Down
4 changes: 2 additions & 2 deletions pipes/WDL/tasks/tasks_demux.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ task merge_tarballs {
String out_filename

Int? machine_mem_gb
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}

Int disk_size = 2625
Expand Down Expand Up @@ -163,7 +163,7 @@ task illumina_demux {
Int? machine_mem_gb
Int disk_size = 2625
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
parameter_meta {
Expand Down
2 changes: 1 addition & 1 deletion pipes/WDL/tasks/tasks_interhost.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ task index_ref {
File? novocraft_license

Int? machine_mem_gb
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}

Int disk_size = 100
Expand Down
6 changes: 3 additions & 3 deletions pipes/WDL/tasks/tasks_ncbi.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ task structured_comments {

File? filter_to_ids

String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
String out_base = basename(assembly_stats_tsv, '.txt')
command <<<
Expand Down Expand Up @@ -272,7 +272,7 @@ task rename_fasta_header {
String out_basename = basename(genome_fasta, ".fasta")
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
command {
set -e
Expand Down Expand Up @@ -437,7 +437,7 @@ task sra_meta_prep {
Boolean paired
String out_name = "sra_metadata.tsv"
String docker="quay.io/broadinstitute/viral-core:2.3.4"
String docker="quay.io/broadinstitute/viral-core:2.3.5"
}
Int disk_size = 100
parameter_meta {
Expand Down
4 changes: 2 additions & 2 deletions pipes/WDL/tasks/tasks_nextstrain.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ task derived_cols {
String? lab_highlight_loc
Array[File] table_map = []
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
Int disk_size = 50
}
parameter_meta {
Expand Down Expand Up @@ -891,7 +891,7 @@ task filter_sequences_to_list {
String out_fname = sub(sub(basename(sequences, ".zst"), ".vcf", ".filtered.vcf"), ".fasta$", ".filtered.fasta")
# Prior docker image: "nextstrain/base:build-20240318T173028Z"
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
Int disk_size = 750
}
parameter_meta {
Expand Down
14 changes: 7 additions & 7 deletions pipes/WDL/tasks/tasks_read_utils.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ task group_bams_by_sample {
task get_bam_samplename {
input {
File bam
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
Int disk_size = round(size(bam, "GB")) + 50
command <<<
Expand All @@ -111,7 +111,7 @@ task get_sample_meta {
input {
Array[File] samplesheets_extended
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
Int disk_size = 50
command <<<
Expand Down Expand Up @@ -172,7 +172,7 @@ task merge_and_reheader_bams {
File? reheader_table
String out_basename = basename(in_bams[0], ".bam")
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
Int disk_size = 750
Int machine_mem_gb = 4
}
Expand Down Expand Up @@ -244,7 +244,7 @@ task rmdup_ubam {
String method = "mvicuna"
Int machine_mem_gb = 7
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
Int disk_size = 375
Expand Down Expand Up @@ -303,7 +303,7 @@ task downsample_bams {
Boolean deduplicateAfter = false
Int? machine_mem_gb
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
Int disk_size = 750
Expand Down Expand Up @@ -367,7 +367,7 @@ task FastqToUBAM {
String? sequencing_center
String? additional_picard_options
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
Int disk_size = 375
parameter_meta {
Expand Down Expand Up @@ -418,7 +418,7 @@ task read_depths {
File aligned_bam
String out_basename = basename(aligned_bam, '.bam')
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
Int disk_size = 200
command <<<
Expand Down
12 changes: 6 additions & 6 deletions pipes/WDL/tasks/tasks_reports.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ task alignment_metrics {
Int max_amplicons=500

Int machine_mem_gb=32
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}

String out_basename = basename(aligned_bam, ".bam")
Expand Down Expand Up @@ -137,7 +137,7 @@ task plot_coverage {
String? plotXLimits # of the form "min max" (ints, space between)
String? plotYLimits # of the form "min max" (ints, space between)
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}

Int disk_size = 375
Expand Down Expand Up @@ -284,7 +284,7 @@ task coverage_report {
Array[File] mapped_bam_idx # optional.. speeds it up if you provide it, otherwise we auto-index
String out_report_name = "coverage_report.txt"
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
Int disk_size = 375
Expand Down Expand Up @@ -351,7 +351,7 @@ task fastqc {
input {
File reads_bam
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
parameter_meta {
reads_bam:{
Expand Down Expand Up @@ -399,7 +399,7 @@ task align_and_count {
Boolean keep_duplicates_when_filtering = false
Int? machine_mem_gb
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
String reads_basename=basename(reads_bam, ".bam")
Expand Down Expand Up @@ -511,7 +511,7 @@ task align_and_count_summary {
String output_prefix = "count_summary"
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
Int disk_size = 100
Expand Down
2 changes: 1 addition & 1 deletion pipes/WDL/tasks/tasks_taxon_filter.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ task merge_one_per_sample {
Boolean rmdup = false

Int machine_mem_gb = 7
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}

Int disk_size = 750
Expand Down
2 changes: 1 addition & 1 deletion pipes/WDL/tasks/tasks_terra.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ task create_or_update_sample_tables {
String sample_table_name = "sample"
String library_table_name = "library"
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
meta {
Expand Down
8 changes: 4 additions & 4 deletions pipes/WDL/tasks/tasks_utils.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ task zcat {
{ if [ -f /sys/fs/cgroup/memory.peak ]; then cat /sys/fs/cgroup/memory.peak; elif [ -f /sys/fs/cgroup/memory/memory.peak ]; then cat /sys/fs/cgroup/memory/memory.peak; elif [ -f /sys/fs/cgroup/memory/memory.max_usage_in_bytes ]; then cat /sys/fs/cgroup/memory/memory.max_usage_in_bytes; else echo "0"; fi } > MEM_BYTES
>>>
runtime {
docker: "quay.io/broadinstitute/viral-core:2.3.4"
docker: "quay.io/broadinstitute/viral-core:2.3.5"
memory: "1 GB"
cpu: cpus
disks: "local-disk " + disk_size + " LOCAL"
Expand Down Expand Up @@ -430,7 +430,7 @@ task tsv_join {
runtime {
memory: "~{machine_mem_gb} GB"
cpu: 4
docker: "quay.io/broadinstitute/viral-core:2.3.4"
docker: "quay.io/broadinstitute/viral-core:2.3.5"
disks: "local-disk " + disk_size + " HDD"
disk: disk_size + " GB" # TES
dx_instance_type: "mem1_ssd1_v2_x4"
Expand Down Expand Up @@ -517,7 +517,7 @@ task tsv_stack {
input {
Array[File]+ input_tsvs
String out_basename
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
}
Int disk_size = 50
Expand Down Expand Up @@ -780,7 +780,7 @@ task filter_sequences_by_length {
File sequences_fasta
Int min_non_N = 1
String docker = "quay.io/broadinstitute/viral-core:2.3.4"
String docker = "quay.io/broadinstitute/viral-core:2.3.5"
Int disk_size = 750
}
parameter_meta {
Expand Down
2 changes: 1 addition & 1 deletion requirements-modules.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
broadinstitute/viral-core=2.3.4
broadinstitute/viral-core=2.3.5
broadinstitute/viral-assemble=2.3.4.0
broadinstitute/viral-classify=2.2.4.2
broadinstitute/viral-phylo=2.1.20.2
Expand Down

0 comments on commit 8b65adc

Please sign in to comment.