Skip to content

Commit

Permalink
Merge branch 'hotfix/1.6.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
David Jones committed May 9, 2016
2 parents ec28e2c + 0d82e44 commit e7ca306
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 1.6.1
* Replaced prerequestite test for Bio::DB::Sam with Bio::DB::HTS in setup.sh

## 1.6.0
* Now uses UCSC defined types as opposed to genome/exome etc. WXS,WGS,AMPLICON,RNASEQ defined so far
* Uses Bio::DB::HTS rather than Bio::DB::Sam - cram can be used
Binary file modified docs.tar.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/Sanger/CGP/CavemanPostProcessing.pm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use Attribute::Abstract;
use Data::Dumper;
use base 'Exporter';

our $VERSION = '1.6.0';
our $VERSION = '1.6.1';
our @EXPORT = qw($VERSION);

const my $MATCH_CIG => 'M';
Expand Down
2 changes: 1 addition & 1 deletion lib/Sanger/CGP/CavemanPostProcessor.pm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use Attribute::Abstract;
use Data::Dumper;
use base 'Exporter';

our $VERSION = '1.6.0';
our $VERSION = '1.6.1';
our @EXPORT = qw($VERSION);

const my $MATCH_CIG => 'M';
Expand Down
6 changes: 3 additions & 3 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ if [[ "x$CGPVCF" == "x" ]] ; then
exit 1;
fi

BIODBSAM=`perl -le 'eval "require $ARGV[0]" and print $ARGV[0]->VERSION' Bio::DB::Sam`
if [[ "x$BIODBSAM" == "x" ]] ; then
echo "PREREQUISITE: Please install Bio::DB::Sam before proceeding"
BIODBHTS=`perl -le 'eval "require $ARGV[0]" and print $ARGV[0]->VERSION' Bio::DB::HTS`
if [[ "x$BIODBHTS" == "x" ]] ; then
echo "PREREQUISITE: Please install Bio::DB::HTs before proceeding"
exit 1;
fi

Expand Down

0 comments on commit e7ca306

Please sign in to comment.