Merge branch 'release/2.1.0'

cancerit · Jul 24, 2017 · eb56bf6 · eb56bf6
2 parents 898ec41 + b42aa4e
commit eb56bf6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+### 2.1.0
+* Fixes various sort order issues in CaVEMan, cgpPindel and VAGrENT affecting
+comparison of results from same inputs.
+
 ### 2.0.7
 * Bumps cgpPindel to [v2.2.3](https://github.com/cancerit/cgpPindel/releases/tag/v2.2.3) to fix bug in DI event collation.
 

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM  quay.io/wtsicgp/dockstore-cgpmap:2.0.3
 MAINTAINER  keiranmraine@gmail.com
 
 LABEL uk.ac.sanger.cgp="Cancer Genome Project, Wellcome Trust Sanger Institute" \
-      version="2.0.7" \
+      version="2.1.0" \
       description="The CGP WXS pipeline for dockstore.org"
 
 USER  root

diff --git a/Dockstore.cwl b/Dockstore.cwl
@@ -19,7 +19,7 @@ dct:creator:
 
 requirements:
   - class: DockerRequirement
-    dockerPull: "quay.io/wtsicgp/dockstore-cgpwxs:2.0.7"
+    dockerPull: "quay.io/wtsicgp/dockstore-cgpwxs:2.1.0"
 
 hints:
   - class: ResourceRequirement

diff --git a/build/opt-build.sh b/build/opt-build.sh
@@ -13,10 +13,10 @@ VER_CGPVCF="v2.2.0"
 VER_VCFTOOLS="0.1.14"
 
 # cgpPindel
-VER_CGPPINDEL="v2.2.3"
+VER_CGPPINDEL="v2.2.4"
 
 # cgpCaVEManPostProcessing
-VER_CGPCAVEPOSTPROC="1.6.8"
+VER_CGPCAVEPOSTPROC="1.6.9"
 # Warning bedtools 2.24.0 and 2.25.0 have a swapped usage in coverageBed
 # No upgrades until [this ticket](https://github.com/arq5x/bedtools2/issues/319) is resolved
 VER_BEDTOOLS="2.21.0"
@@ -26,7 +26,7 @@ VER_CGPCAVEWRAP="1.11.0"
 VER_CAVEMAN="1.11.3"
 
 # VAGrENT
-VER_VAGRENT="v3.2.1"
+VER_VAGRENT="v3.2.2"
 
 if [ "$#" -lt "1" ] ; then
   echo "Please provide an installation path such as /opt/ICGC"