Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,56 +1,57 @@
dist: focal

language: "perl"

perl:
- "5.26"
- "5.14"
- "5.32"

env:
matrix:
- HTSLIB_VERSION=1.3.1
- HTSLIB_VERSION=1.5
- HTSLIB_VERSION=1.7
- HTSLIB_VERSION=1.8
- HTSLIB_VERSION=1.9
global:
- ENSDIR=$TRAVIS_BUILD_DIR/..
- COVERALLS="false"
jobs:
- HTSLIB_VERSION=1.9
- HTSLIB_VERSION=1.10
- HTSLIB_VERSION=1.11
- HTSLIB_VERSION=1.12
- HTSLIB_VERSION=1.13

sudo: false

addons:
apt:
packages:
- unzip
- liblzma-dev
- libbz2-dev
apt:
packages:
- unzip
- liblzma-dev
- libbz2-dev
- zlib1g-dev
- libcurl4-gnutls-dev
- libpng-dev
- libssl-dev
- openssl
- libexpat1-dev
- libdb-dev

before_install:
- git clone -b BioPerl-v1.7.4 --depth 1 https://github.com/bioperl/bioperl-live.git
- cd $ENSDIR
- git clone --branch main --depth 1 https://github.com/Ensembl/ensembl-test.git
- cd $TRAVIS_BUILD_DIR

install:
- git clone --branch $HTSLIB_VERSION --depth=1 https://github.com/samtools/htslib.git
- git clone --branch $HTSLIB_VERSION --recurse-submodules --shallow-submodules https://github.com/samtools/htslib.git
- cd htslib
- make prefix=~/biodbhts install
- export HTSLIB_DIR=
- cd ..
# manually install items listed from cpanfile so we can skip BioPerl
- cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
- cpanm -f -n Carp
- cpanm -f -n Test::Most
- cpanm -f -n Test::LeakTrace
- cpanm -f -n Module::Build
- cpanm -f -n Log::Log4perl
- cpanm -f -n Try::Tiny
# - cpanm -v --installdeps --notest .
# install the modules just used here
- cpanm --notest Perl::Tidy
- cpanm --notest Test::Code::TidyAll
- export PERL5LIB=$PERL5LIB:$PWD/bioperl-live/lib
- cpanm -v --sudo --notest XML::LibXML # https://github.com/shlomif/perl-XML-LibXML/pull/87
- cpanm -v --sudo --installdeps --notest .
- perl Build.PL --prefix=~/biodbhts
- ./Build
- ./Build test

script: "./travisci/harness.sh"


notifications:
email:
on_success: always
Expand Down
4 changes: 4 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
3.02
* HTSlib versions < 1.9 are deprecated and not supported anymore
* HTSlib supported versions: 1.9, 1.10, 1.11, 1.12, 1.13
* BioPerl minimum supported version is 1.6.924
3.01
* HTSlib 1.9 compatibility
* CentOS 7 compatible installation, courtesy of John Marshall
Expand Down
2 changes: 1 addition & 1 deletion cpanfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
requires 'Carp';
requires 'Bio::Perl';
requires 'Bio::Perl', '1.7.4';
requires 'Log::Log4perl';
requires 'Try::Tiny';
requires 'Test::Most';
Expand Down
8 changes: 4 additions & 4 deletions lib/Bio/DB/HTS.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1348,7 +1348,7 @@ L<http://search.cpan.org/dist/Bio-DB-HTS/>
=cut

package Bio::DB::HTS;
$Bio::DB::HTS::VERSION = '3.01';
$Bio::DB::HTS::VERSION = '3.02';

use strict;
use warnings;
Expand Down Expand Up @@ -2141,7 +2141,7 @@ sub _glob_match {

package Bio::DB::HTS::Fai;

$Bio::DB::HTS::Fai::VERSION = '3.01';
$Bio::DB::HTS::Fai::VERSION = '3.02';

sub open { shift->load(@_) }

Expand All @@ -2158,7 +2158,7 @@ package Bio::SeqFeature::HTSCoverage;

use base 'Bio::SeqFeature::Lite';

$Bio::SeqFeature::HTSCoverage::VERSION = '3.01';
$Bio::SeqFeature::HTSCoverage::VERSION = '3.02';

sub coverage {
my $self = shift;
Expand Down Expand Up @@ -2190,7 +2190,7 @@ sub gff3_string {

package Bio::DB::HTSfile;

$Bio::DB::HTS::HTSfile::VERSION = '3.01';
$Bio::DB::HTS::HTSfile::VERSION = '3.02';

use File::Spec;
use Cwd;
Expand Down
4 changes: 2 additions & 2 deletions lib/Bio/DB/HTS/AlignWrapper.pm
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Rishi Nag E<lt>[email protected]<gt>
=cut

package Bio::DB::HTS::AlignWrapper;
$Bio::DB::HTS::AlignWrapper::VERSION = '3.01';
$Bio::DB::HTS::AlignWrapper::VERSION = '3.02';

use strict;
use warnings;
Expand Down Expand Up @@ -452,7 +452,7 @@ sub tam_line {

package Bio::DB::HTS::SplitAlignmentPart;

$Bio::DB::HTS::SplitAlignmentPart::VERSION = '3.01';
$Bio::DB::HTS::SplitAlignmentPart::VERSION = '3.02';

use base 'Bio::SeqFeature::Lite';

Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/Alignment.pm
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ Rishi Nag E<lt>[email protected]<gt>
=cut

package Bio::DB::HTS::Alignment;
$Bio::DB::HTS::Alignment::VERSION = '3.01';
$Bio::DB::HTS::Alignment::VERSION = '3.02';

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/Constants.pm
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ L<Bio::Perl>, L<Bio::DB::HTS>, L<Bio::DB::Bam::Alignment>
=cut

package Bio::DB::HTS::Constants;
$Bio::DB::HTS::Constants::VERSION = '3.01';
$Bio::DB::HTS::Constants::VERSION = '3.02';

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/Faidx.pm
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ our @EXPORT = qw(

);

our $VERSION = '3.01';
our $VERSION = '3.02';

require XSLoader;
XSLoader::load('Bio::DB::HTS::Faidx', $VERSION);
Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/FetchIterator.pm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Rishi Nag E<lt>[email protected]<gt>
=cut

package Bio::DB::HTS::FetchIterator;
$Bio::DB::HTS::FetchIterator::VERSION = '3.01';
$Bio::DB::HTS::FetchIterator::VERSION = '3.02';

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/Kseq.pm
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ package Bio::DB::HTS::Kseq;
use Bio::DB::HTS; #load the XS
use Bio::DB::HTS::Kseq::Record;

$Bio::DB::HTS::Kseq::VERSION = '3.01';
$Bio::DB::HTS::Kseq::VERSION = '3.02';

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/Kseq/Record.pm
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ The quality string from a FASTA/Q record
use strict;
use warnings;

$Bio::DB::HTS::Kseq::Record::VERSION = '3.01';
$Bio::DB::HTS::Kseq::Record::VERSION = '3.02';

sub name {
return $_[0]->{name};
Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/Pileup.pm
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,6 @@ package Bio::DB::HTS::Pileup;
use strict;
use warnings;

$Bio::DB::HTS::Pileup::VERSION = '3.01';
$Bio::DB::HTS::Pileup::VERSION = '3.02';

1;
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/PileupWrapper.pm
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ L<Bio::Perl>, L<Bio::DB::HTS>, L<Bio::DB::HTS::Constants>
=cut

package Bio::DB::HTS::PileupWrapper;
$Bio::DB::HTS::PileupWrapper::VERSION = '3.01';
$Bio::DB::HTS::PileupWrapper::VERSION = '3.02';

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/Query.pm
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ part of a SAM alignment.
=cut

package Bio::DB::HTS::Query;
$Bio::DB::HTS::Query::VERSION = '3.01';
$Bio::DB::HTS::Query::VERSION = '3.02';

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/ReadIterator.pm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Rishi Nag E<lt>[email protected]<gt>
=cut

package Bio::DB::HTS::ReadIterator;
$Bio::DB::HTS::ReadIterator::VERSION = '3.01';
$Bio::DB::HTS::ReadIterator::VERSION = '3.02';

use strict;
use warnings;
Expand Down
4 changes: 2 additions & 2 deletions lib/Bio/DB/HTS/Segment.pm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Rishi Nag E<lt>[email protected]<gt>
=cut

package Bio::DB::HTS::Segment;
$Bio::DB::HTS::Segment::VERSION = '3.01';
$Bio::DB::HTS::Segment::VERSION = '3.02';

use strict;
use warnings;
Expand Down Expand Up @@ -122,7 +122,7 @@ sub class { 'sequence' }

package Bio::DB::HTS::Segment::Iterator;

$Bio::DB::HTS::Segment::Iterator::VERSION = '3.01';
$Bio::DB::HTS::Segment::Iterator::VERSION = '3.02';

sub new {
my $package = shift;
Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/Tabix.pm
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package Bio::DB::HTS::Tabix;

use Bio::DB::HTS;
use Bio::DB::HTS::Tabix::Iterator;
$Bio::DB::HTS::Tabix::VERSION = '3.01';
$Bio::DB::HTS::Tabix::VERSION = '3.02';
use strict;
use warnings;

Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/Tabix/Iterator.pm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
package Bio::DB::HTS::Tabix::Iterator;

use Bio::DB::HTS; #load the XS
$Bio::DB::HTS::Tabix::Iterator::VERSION = '3.01';
$Bio::DB::HTS::Tabix::Iterator::VERSION = '3.02';

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/Target.pm
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Rishi Nag E<lt>[email protected]<gt>
=cut

package Bio::DB::HTS::Target;
$Bio::DB::HTS::Target::VERSION = '3.01';
$Bio::DB::HTS::Target::VERSION = '3.02';

use strict;
use warnings;
Expand Down
4 changes: 2 additions & 2 deletions lib/Bio/DB/HTS/VCF.pm
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ so using the next() function is preferable to using sweeps.
=cut

package Bio::DB::HTS::VCF;
$Bio::DB::HTS::VCF::VERSION = '3.01';
$Bio::DB::HTS::VCF::VERSION = '3.02';

use Bio::DB::HTS;
use Scalar::Util qw/reftype/;
Expand Down Expand Up @@ -507,7 +507,7 @@ sub DESTROY {
}

package Bio::DB::HTS::VCF::Sweep ;
$Bio::DB::HTS::VCF::Sweep::VERSION = '3.01';
$Bio::DB::HTS::VCF::Sweep::VERSION = '3.02';

use Bio::DB::HTS;
use Scalar::Util qw/reftype/;
Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/VCF/Header.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ package Bio::DB::HTS::VCF::Header;

use Bio::DB::HTS; #load the XS

$Bio::DB::HTS::VCF::Header::VERSION = '3.01';
$Bio::DB::HTS::VCF::Header::VERSION = '3.02';

1;
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/VCF/HeaderPtr.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package Bio::DB::HTS::VCF::HeaderPtr;

use base Bio::DB::HTS::VCF::Header;

$Bio::DB::HTS::VCF::HeaderPtr::VERSION = '3.01';
$Bio::DB::HTS::VCF::HeaderPtr::VERSION = '3.02';

sub DESTROY {
# do nothing (overwrite subroutine in base class)
Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/VCF/Iterator.pm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
package Bio::DB::HTS::VCF::Iterator;

use Bio::DB::HTS; #load the XS
$Bio::DB::HTS::VCF::Iterator::VERSION = '3.01';
$Bio::DB::HTS::VCF::Iterator::VERSION = '3.02';

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/VCF/Row.pm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package Bio::DB::HTS::VCF::Row;

$Bio::DB::HTS::VCF::Row::VERSION = '3.01';
$Bio::DB::HTS::VCF::Row::VERSION = '3.02';

use Bio::DB::HTS;

Expand Down
2 changes: 1 addition & 1 deletion lib/Bio/DB/HTS/VCF/RowPtr.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package Bio::DB::HTS::VCF::RowPtr;

use base Bio::DB::HTS::VCF::Row;

$Bio::DB::HTS::VCF::RowPtr::VERSION = '3.01';
$Bio::DB::HTS::VCF::RowPtr::VERSION = '3.02';

sub DESTROY {
# do nothing (overwrite subroutine in base class)
Expand Down
10 changes: 5 additions & 5 deletions travisci/harness.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#!/bin/bash
export PERL5LIB=$PERL5LIB:$PWD/ensembl-test/modules:$PWD/lib:$PWD/blib/arch/auto/Bio/DB/HTS/:$PWD/blib/arch/auto/Bio/DB/HTS/Faidx

export TEST_AUTHOR=$USER
ENSDIR="${ENSDIR:-$PWD}"

export PERL5LIB=$ENSDIR/ensembl-test/modules:$PWD/lib:$PWD/blib/arch/auto/Bio/DB/HTS/:$PWD/blib/arch/auto/Bio/DB/HTS/Faidx

export WORK_DIR=$PWD
export TEST_AUTHOR=$USER

echo "Running test suite"
echo "Using PERL5LIB:$PERL5LIB"
Expand All @@ -17,8 +18,7 @@ ls -l t
echo "COVERALLS value=$COVERALLS"
echo "HTSLIB_VERSION value=$HTSLIB_VERSION"

perl $PWD/ensembl-test/scripts/runtests.pl t $SKIP_TESTS

perl $ENSDIR/ensembl-test/scripts/runtests.pl t $SKIP_TESTS

rt=$?
if [ $rt -eq 0 ]; then
Expand Down