Merge pull request #68 from icgc-argo/validate-seqtools@0.1.7

[release]
icgc-argo · Feb 13, 2023 · c121c04 · c121c04
2 parents 77b3cff + 5f82f85
commit c121c04
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/validate-seqtools/Dockerfile b/validate-seqtools/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update && \
     apt-get install -y libz-dev pkg-config libtool m4 autotools-dev automake libncurses5-dev libbz2-dev liblzma-dev && \
     apt-get install -y git-all && \
     apt-get install -y jq && \
-    apt-get install -y locales
+    apt-get install -y locales pigz pbzip2
 
 # Set local
 

diff --git a/validate-seqtools/main.nf b/validate-seqtools/main.nf
@@ -25,7 +25,7 @@
 /* this block is auto-generated based on info from pkg.json where   */
 /* changes can be made if needed, do NOT modify this block manually */
 nextflow.enable.dsl = 2
-version = '0.1.6'
+version = '0.1.7'
 
 container = [
     'ghcr.io': 'ghcr.io/icgc-argo/argo-data-submission.validate-seqtools'
@@ -46,7 +46,7 @@ params.publish_dir = ""  // set to empty string will disable publishDir
 
 // tool specific parmas go here, add / change as needed
 params.json_file = ""
-params.skippable_tests = []
+params.skippable_tests = ""
 params.files = ""
 
 
@@ -73,7 +73,7 @@ process validateSeqtools {
     cp ${json_file} local_copy
     python3 /tools/main.py \
       -j local_copy \
-      -k ${skippable_tests.join(" ")} \
+      -k ${skippable_tests.replaceAll(","," ")} \
       -t ${params.cpus} \
       > seq-tools.log 2>&1
 

diff --git a/validate-seqtools/pkg.json b/validate-seqtools/pkg.json
@@ -1,6 +1,6 @@
 {
     "name": "validate-seqtools",
-    "version": "0.1.6",
+    "version": "0.1.7",
     "description": "Using Seq-tools, validates molecular",
     "main": "main.nf",
     "deprecated": false,

diff --git a/validate-seqtools/tests/checker.nf b/validate-seqtools/tests/checker.nf
@@ -29,7 +29,7 @@
 /* this block is auto-generated based on info from pkg.json where   */
 /* changes can be made if needed, do NOT modify this block manually */
 nextflow.enable.dsl = 2
-version = '0.1.6'
+version = '0.1.7'
 
 container = [
     'ghcr.io': 'ghcr.io/icgc-argo/argo-data-submission.validate-seqtools'
@@ -42,7 +42,7 @@ params.container_registry = ""
 params.container_version = ""
 params.container = ""
 
-params.skippable_tests=[]
+params.skippable_tests=""
 
 include { validateSeqtools } from '../main'
 

diff --git a/validate-seqtools/tests/test-job-bam-w-skips.json b/validate-seqtools/tests/test-job-bam-w-skips.json
@@ -2,5 +2,5 @@
     "json_file": "input/anon_chr1_complete.json",
     "files": ["input/anon_chr1_complete.bam"],
     "expected_output": "expected/anon_chr1_rnaseq.validation_report.PASS-with-WARNING-and-SKIPPED-check.jsonl",
-    "skippable_tests" : ["c681","c683","c609"]
+    "skippable_tests" : "c681,c683,c609"
 }