Merge pull request #270 from ENCODE-DCC/dev

v2.1.5

chip.wdl

@@ -7,10 +7,10 @@ struct RuntimeEnvironment {
 }
 
 workflow chip {
-    String pipeline_ver = 'v2.1.4'
+    String pipeline_ver = 'v2.1.5'
 
     meta {
-        version: 'v2.1.4'
+        version: 'v2.1.5'
 
         author: 'Jin wook Lee'
         email: '[email protected]'
@@ -19,8 +19,8 @@ workflow chip {
 
         specification_document: 'https://docs.google.com/document/d/1lG_Rd7fnYgRpSIqrIfuVlAz2dW1VaSQThzk836Db99c/edit?usp=sharing'
 
-        default_docker: 'encodedcc/chip-seq-pipeline:v2.1.4'
-        default_singularity: 'https://encode-pipeline-singularity-image.s3.us-west-2.amazonaws.com/chip-seq-pipeline_v2.1.4.sif'
+        default_docker: 'encodedcc/chip-seq-pipeline:v2.1.5'
+        default_singularity: 'https://encode-pipeline-singularity-image.s3.us-west-2.amazonaws.com/chip-seq-pipeline_v2.1.5.sif'
         croo_out_def: 'https://storage.googleapis.com/encode-pipeline-output-definition/chip.croo.v5.json'
 
         parameter_group: {
@@ -71,8 +71,8 @@ workflow chip {
     }
     input {
         # group: runtime_environment
-        String docker = 'encodedcc/chip-seq-pipeline:v2.1.4'
-        String singularity = 'https://encode-pipeline-singularity-image.s3.us-west-2.amazonaws.com/chip-seq-pipeline_v2.1.4.sif'
+        String docker = 'encodedcc/chip-seq-pipeline:v2.1.5'
+        String singularity = 'https://encode-pipeline-singularity-image.s3.us-west-2.amazonaws.com/chip-seq-pipeline_v2.1.5.sif'
         String conda = 'encode-chip-seq-pipeline'
         String conda_macs2 = 'encode-chip-seq-pipeline-macs2'
         String conda_spp = 'encode-chip-seq-pipeline-spp'

scripts/install_conda_env.sh

@@ -14,9 +14,12 @@ conda create -n encode-chip-seq-pipeline-macs2 --file ${SH_SCRIPT_DIR}/requireme
 conda create -n encode-chip-seq-pipeline-spp --file ${SH_SCRIPT_DIR}/requirements.spp.txt \
   --override-channels -c r -c bioconda -c defaults -y
 
-# adhoc fix for https://github.com/ENCODE-DCC/chip-seq-pipeline2/issues/259
-# force-install readline 6.2 from conda-forge (ignoring dependencies)
-conda install -n encode-chip-seq-pipeline-spp --no-deps --no-update-deps -y readline==6.2 -c conda-forge
+# adhoc fix for the following issues:
+# - https://github.com/ENCODE-DCC/chip-seq-pipeline2/issues/259
+# - https://github.com/ENCODE-DCC/chip-seq-pipeline2/issues/265
+# force-install readline 6.2, ncurses 5.9 from conda-forge (ignoring dependencies)
+conda install -n encode-chip-seq-pipeline-spp --no-deps --no-update-deps -y \
+  readline==6.2 ncurses==5.9 -c conda-forge
 
 echo "$(date): Done successfully."
 

src/encode_task_spp.py

@@ -67,7 +67,7 @@ def spp(ta, ctl_ta, chrsz, fraglen, cap_num_peak, fdr_thresh,
     basename_prefix = '{}_x_{}'.format(basename_ta, basename_ctl_ta)
     if len(basename_prefix) > 200:  # UNIX cannot have filename > 255
         basename_prefix = '{}_x_control'.format(basename_ta)
-    nth_param = '-p={}'.format(nth) if nth < 2 else ''
+    nth_param = '-p={}'.format(nth) if nth >= 2 else ''
     prefix = os.path.join(out_dir, basename_prefix)
     rpeak = '{}.{}.regionPeak.gz'.format(
         prefix,