Merge tag 'v6.3.3' into dev

singularity edgecase, likely due to change in pcap-core base image
cancerit · Jun 29, 2020 · 5f07ea5 · 5f07ea5
2 parents b720b53 + c7c90b1
commit 5f07ea5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## v6.3.3
+
+* Singularity specific execution issue corrected
+
 ## v6.3.2
 
 * Fix edgecase on RG line handling (#99)

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM  quay.io/wtsicgp/pcap-core:5.0.4 as builder
+FROM  quay.io/wtsicgp/pcap-core:5.0.5 as builder
 
 USER  root
 
@@ -69,7 +69,7 @@ FROM ubuntu:16.04
 
 LABEL maintainer="[email protected]" \
       uk.ac.sanger.cgp="Cancer, Ageing and Somatic Mutation, Wellcome Trust Sanger Institute" \
-      version="v6.3.2" \
+      version="v6.3.3" \
       description="BRASS docker"
 
 RUN apt-get -yq update \

diff --git a/perl/bin/brass.pl b/perl/bin/brass.pl
@@ -67,7 +67,6 @@
 {
   my $options = setup();
   my $threads = PCAP::Threaded->new($options->{'threads'});
-  &PCAP::Threaded::disable_out_err if(exists $options->{'index'});
 
   # register any process that can run in parallel here
   $threads->add_function('input', \&Sanger::CGP::Brass::Implement::input);

diff --git a/perl/lib/Bio/Brass.pm b/perl/lib/Bio/Brass.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(find_breakpoints find_dusty_vertices
 		 is_dusty get_isolated_bp_alignment get_isolated_bp_surrounding_region
 		 $VERSION);
 
-our $VERSION = '6.3.2';
+our $VERSION = '6.3.3';
 
 =head1 NAME