Skip to content

Commit 9e3df5e

Browse files
committed
Merge branch 'hotfix/v6.3.1'
2 parents a041a09 + 8fcf5f9 commit 9e3df5e

File tree

8 files changed

+120
-99
lines changed

8 files changed

+120
-99
lines changed

.travis.yml

Lines changed: 19 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -2,70 +2,26 @@ notifications:
22
slack: wtsi-cgpit:ptUMR1tkNyZJYd9TpGoss8WR
33
email: false
44

5-
env:
6-
- CC=gcc
5+
sudo: false
76

8-
addons:
9-
apt:
10-
packages:
11-
- autoconf
12-
- bsdtar
13-
- build-essential
14-
- curl
15-
- exonerate
16-
- libboost-iostreams-dev
17-
- libboost-dev
18-
- libbz2-dev
19-
- libcurl4-openssl-dev
20-
- libexpat1-dev
21-
- libgoogle-perftools-dev
22-
- liblzma-dev
23-
- libncurses5-dev
24-
- libpng12-dev
25-
- libpstreams-dev
26-
- lsof
27-
- nettle-dev
28-
- time
29-
- unzip
30-
- zlib1g-dev
31-
- libgd-dev
32-
- libdb-dev
33-
- liblzma-dev
34-
- libgnutls-dev
35-
- libtasn1-6-dev
36-
- p11-kit
7+
services:
8+
- docker
379

38-
install:
39-
- git clone --depth 1 --single-branch --branch develop https://github.com/cancerit/cgpBigWig.git
40-
- cd cgpBigWig
41-
- ./setup.sh $HOME/wtsi-opt
42-
- cd ../
43-
- rm -rf cgpBigWig
44-
- git clone --depth 1 --single-branch --branch develop https://github.com/cancerit/PCAP-core.git
45-
- cd PCAP-core
46-
- ./setup.sh $HOME/wtsi-opt
47-
- cd ../
48-
- rm -rf PCAP-core
49-
- git clone --depth 1 --single-branch --branch dev https://github.com/cancerit/cgpVcf.git
50-
- cd cgpVcf
51-
- ./setup.sh $HOME/wtsi-opt
52-
- cd ../
53-
- rm -rf cgpVcf
54-
- git clone --depth 1 --single-branch --branch dev https://github.com/cancerit/VAGrENT.git
55-
- cd VAGrENT
56-
- ./setup.sh $HOME/wtsi-opt
57-
- cd ../
58-
- rm -rf VAGrENT
59-
- git clone --depth 1 --single-branch --branch dev https://github.com/cancerit/grass.git
60-
- cd grass
61-
- ./setup.sh $HOME/wtsi-opt
62-
- cd ../
63-
- rm -rf grass
64-
65-
language: perl
10+
script:
11+
- set -e
12+
- echo 'Build and check docker image'
13+
- docker build -t brass .
14+
- docker images | grep -c brass
15+
- echo 'Verify program(s) from each inherited base image - cgpbigwig'
16+
- docker run -t --rm brass bwjoin --version
17+
- echo 'Verify program(s) from each inherited base image - pcap-core'
18+
- docker run -t --rm brass bwa_mem.pl -version
19+
- docker run -t --rm brass bammarkduplicates2 --version
20+
- docker run -t --rm brass samtools --version
21+
- docker run -t --rm brass bash -c 'bwa 2>&1 | grep Version'
22+
- echo 'Verify program(s) from this repo'
23+
- docker run -t --rm brass brass.pl --version
24+
- docker run -t --rm brass brass-group --version
25+
- docker run -t --rm brass brass-assemble --version
6626

67-
perl:
68-
- "5.22"
6927

70-
script:
71-
- ./setup.sh $HOME/wtsi-opt 2

CHANGES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changes
22

3+
## v6.3.1
4+
5+
* Handle undefined value edge case #95.
6+
* Thanks to @udvzol for reproducible test data.
7+
* Updated travis build (#89)
8+
* Fixed up dockerfile to reduce build time when testing.
9+
310
## v6.3.0
411

512
* Adds stand alone (supported) docker container

Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/wtsicgp/dockstore-cgpmap:3.1.4 as builder
1+
FROM quay.io/wtsicgp/pcap-core:5.0.4 as builder
22

33
USER root
44

@@ -57,6 +57,11 @@ ADD build/opt-build.sh build/
5757
RUN bash build/opt-build.sh $OPT
5858

5959
# build the tools in this repo, separate to reduce build time on errors
60+
COPY Rsupport Rsupport
61+
COPY distros distros
62+
ADD build/opt-build-local-deps.sh build/
63+
RUN bash build/opt-build-local-deps.sh $OPT
64+
6065
COPY . .
6166
RUN bash build/opt-build-local.sh $OPT
6267

build/opt-build-local-deps.sh

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
#! /bin/bash
2+
3+
set -xe
4+
5+
if [[ -z "${TMPDIR}" ]]; then
6+
TMPDIR=/tmp
7+
fi
8+
9+
set -u
10+
11+
if [ "$#" -lt "1" ] ; then
12+
echo "Please provide an installation path such as /opt/ICGC"
13+
exit 1
14+
fi
15+
16+
# get path to this script
17+
SCRIPT_PATH=`dirname $0`;
18+
SCRIPT_PATH=`(cd $SCRIPT_PATH && pwd)`
19+
20+
# get the location to install to
21+
INST_PATH=$1
22+
mkdir -p $1
23+
INST_PATH=`(cd $1 && pwd)`
24+
echo $INST_PATH
25+
26+
# get current directory
27+
INIT_DIR=`pwd`
28+
29+
CPU=`grep -c ^processor /proc/cpuinfo`
30+
if [ $? -eq 0 ]; then
31+
if [ "$CPU" -gt "6" ]; then
32+
CPU=6
33+
fi
34+
else
35+
CPU=1
36+
fi
37+
echo "Max compilation CPUs set to $CPU"
38+
39+
SETUP_DIR=$INIT_DIR/install_tmp
40+
mkdir -p $SETUP_DIR/distro # don't delete the actual distro directory until the very end
41+
mkdir -p $INST_PATH/bin
42+
cd $SETUP_DIR
43+
44+
# make sure tools installed can see the install loc of libraries
45+
set +u
46+
export LD_LIBRARY_PATH=`echo $INST_PATH/lib:$LD_LIBRARY_PATH | perl -pe 's/:\$//;'`
47+
export PATH=`echo $INST_PATH/bin:$PATH | perl -pe 's/:\$//;'`
48+
export MANPATH=`echo $INST_PATH/man:$INST_PATH/share/man:$MANPATH | perl -pe 's/:\$//;'`
49+
export PERL5LIB=`echo $INST_PATH/lib/perl5:$PERL5LIB | perl -pe 's/:\$//;'`
50+
set -u
51+
52+
# Rlibs
53+
if [ ! -e $SETUP_DIR/Rlib.success ]; then
54+
cd $INIT_DIR/Rsupport
55+
./setupR.sh $OPT
56+
touch $SETUP_DIR/Rlib.success
57+
fi
58+
59+
## install included distro for velvet
60+
if [ ! -e $SETUP_DIR/velvet.success ]; then
61+
cd $INIT_DIR
62+
cd $INIT_DIR/distros
63+
tar -mzxf velvet_1.2.10.tgz
64+
cd velvet_1.2.10
65+
make MAXKMERLENGTH=95 velveth velvetg
66+
mv velveth $INST_PATH/bin/velvet95h
67+
mv velvetg $INST_PATH/bin/velvet95g
68+
make clean
69+
make velveth velvetg # don't do multi-threaded make
70+
mv velveth $INST_PATH/bin/velvet31h
71+
mv velvetg $INST_PATH/bin/velvet31g
72+
ln -fs $INST_PATH/bin/velvet95h $INST_PATH/bin/velveth
73+
ln -fs $INST_PATH/bin/velvet95g $INST_PATH/bin/velvetg
74+
cd $INIT_DIR
75+
rm -rf $INIT_DIR/distros/velvet_1.2.10
76+
touch $SETUP_DIR/velvet.success
77+
fi
78+
79+
# cleanup all junk
80+
rm -rf $SETUP_DIR

build/opt-build-local.sh

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -49,33 +49,6 @@ export MANPATH=`echo $INST_PATH/man:$INST_PATH/share/man:$MANPATH | perl -pe 's/
4949
export PERL5LIB=`echo $INST_PATH/lib/perl5:$PERL5LIB | perl -pe 's/:\$//;'`
5050
set -u
5151

52-
# Rlibs
53-
if [ ! -e $SETUP_DIR/Rlib.success ]; then
54-
cd $INIT_DIR/Rsupport
55-
./setupR.sh $OPT
56-
touch $SETUP_DIR/Rlib.success
57-
fi
58-
59-
## install included distro for velvet
60-
if [ ! -e $SETUP_DIR/velvet.success ]; then
61-
cd $INIT_DIR
62-
cd $INIT_DIR/distros
63-
tar -mzxf velvet_1.2.10.tgz
64-
cd velvet_1.2.10
65-
make MAXKMERLENGTH=95 velveth velvetg
66-
mv velveth $INST_PATH/bin/velvet95h
67-
mv velvetg $INST_PATH/bin/velvet95g
68-
make clean
69-
make velveth velvetg # don't do multi-threaded make
70-
mv velveth $INST_PATH/bin/velvet31h
71-
mv velvetg $INST_PATH/bin/velvet31g
72-
ln -fs $INST_PATH/bin/velvet95h $INST_PATH/bin/velveth
73-
ln -fs $INST_PATH/bin/velvet95g $INST_PATH/bin/velvetg
74-
cd $INIT_DIR
75-
rm -rf $INIT_DIR/distros/velvet_1.2.10
76-
touch $SETUP_DIR/velvet.success
77-
fi
78-
7952
## brass c++
8053
if [ ! -e $SETUP_DIR/brass.success ]; then
8154
cd $INIT_DIR

perl/bin/brass.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/perl
22

33
########## LICENCE ##########
4-
# Copyright (c) 2014-2018 Genome Research Ltd.
4+
# Copyright (c) 2014-2020 Genome Research Ltd.
55
#
66
# Author: CASM/Cancer IT <[email protected]>
77
#
@@ -371,7 +371,7 @@ =head1 SYNOPSIS
371371
-genome -g Genome fasta file
372372
-species -s Species name
373373
-assembly -as Assembly name
374-
-protocol -pr Sequencing protocol (WGS|WXS|RNA)
374+
-protocol -pr Sequencing protocol (WGS only - remains for compat)
375375
-g_cache -gc Genome cache file.
376376
-viral -vi Virus sequences from NCBI
377377
-microbe -mi Microbe sequences file prefix from NCBI, please exclude '.N.fa.2bit'

perl/bin/get_abs_bkpts_from_clipped_reads.pl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/perl
22

33
########## LICENCE ##########
4-
# Copyright (c) 2014-2018 Genome Research Ltd.
4+
# Copyright (c) 2014-2020 Genome Research Ltd.
55
#
66
# Author: CASM/Cancer IT <[email protected]>
77
#
@@ -600,8 +600,7 @@ sub collect_reads_by_region {
600600
$dir = ($dir eq '+' ? 1 : -1);
601601
$mate_dir = ($mate_dir eq '+' ? 1 : -1);
602602

603-
my @aln = $bam->get_features_by_location($chr, $start, $end);
604-
@aln = grep {
603+
my @aln = grep {
605604
# !is_supplementary($_->flag) &&
606605
$_->get_tag_values('FLAGS') =~ /PAIRED/ &&
607606
$_->get_tag_values('FLAGS') !~ /UNMAPPED/ &&
@@ -615,13 +614,14 @@ sub collect_reads_by_region {
615614
(
616615
$ignore_mate_pos ||
617616
(
617+
defined $_->mate_seq_id &&
618618
$_->mate_seq_id eq $mate_chr &&
619619
$_->mstrand eq $mate_dir &&
620620
$_->mate_start <= $mate_end &&
621621
$_->mate_start + $_->length - 1 >= $mate_start
622622
)
623623
)
624-
} @aln;
624+
} $bam->get_features_by_location($chr, $start, $end);
625625
return @aln;
626626
}
627627

perl/lib/Bio/Brass.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package Bio::Brass;
22

33
########## LICENCE ##########
4-
# Copyright (c) 2014-2019 Genome Research Ltd.
4+
# Copyright (c) 2014-2020 Genome Research Ltd.
55
#
66
# Author: CASM/Cancer IT <[email protected]>
77
#
@@ -46,7 +46,7 @@ our @EXPORT = qw(find_breakpoints find_dusty_vertices
4646
is_dusty get_isolated_bp_alignment get_isolated_bp_surrounding_region
4747
$VERSION);
4848

49-
our $VERSION = '6.3.0';
49+
our $VERSION = '6.3.1';
5050

5151
=head1 NAME
5252

0 commit comments

Comments
 (0)