Merge branch 'hotfix/1.0.7'

cancerit · Jun 5, 2017 · d4783bc · d4783bc
2 parents c4b9707 + 89e7677
commit d4783bc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+### 1.0.7
+* Update [BRASS to v5.4.0](https://github.com/cancerit/BRASS/releases/tag/v5.4.0)
+  * Specifically fixes a vector merge bug which produces warnings (but no apparent change to results).
+
 ### 1.0.6
 * Fixes #13 - Parsing of sample name from BAM headers fails is sample at end of line
 * Update dockstore-cgpwxs to [2.0.7](https://github.com/cancerit/dockstore-cgpwxs/releases/tag/2.0.7) - Fixes bug in pindel core.

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM  quay.io/wtsicgp/dockstore-cgpwxs:2.0.7
 MAINTAINER  keiranmraine@gmail.com
 
 LABEL uk.ac.sanger.cgp="Cancer Genome Project, Wellcome Trust Sanger Institute" \
-      version="1.0.6" \
+      version="1.0.7" \
       description="The CGP WGS 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-cgpwgs:1.0.6"
+    dockerPull: "quay.io/wtsicgp/dockstore-cgpwgs:1.0.7"
 
 hints:
   - class: ResourceRequirement

diff --git a/build/opt-build.sh b/build/opt-build.sh
@@ -23,7 +23,7 @@ SRC_ASCAT="https://raw.githubusercontent.com/Crick-CancerGenomics/ascat/6d40e69a
 VER_GRASS="v2.1.0"
 
 ### BRASS
-VER_BRASS="v5.3.3"
+VER_BRASS="v5.4.0"
 SOURCE_BLAT="http://users.soe.ucsc.edu/~kent/src/blatSrc35.zip"
 SRC_FASTA36="https://github.com/wrpearson/fasta36/archive/v36.3.8d_13Apr16.tar.gz"