Skip to content

Commit

Permalink
Merge pull request #17 from cancerit/dev
Browse files Browse the repository at this point in the history
Correct @ in regex problem.
  • Loading branch information
David Jones committed Feb 3, 2015
2 parents 6b78b48 + c10fb71 commit a8048bd
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 17 deletions.
1 change: 0 additions & 1 deletion MANIFEST
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
bin/caveman.pl
bin/caveman_merge_results.pl
bin/cpanm
caveman.setup
docs.tar.gz
lib/Sanger/CGP/Caveman.pm
lib/Sanger/CGP/Caveman/Implement.pm
Expand Down
2 changes: 1 addition & 1 deletion MYMETA.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"unknown"
],
"dynamic_config" : 0,
"generated_by" : "ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.131560",
"generated_by" : "ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.142690",
"license" : [
"agpl_3"
],
Expand Down
24 changes: 12 additions & 12 deletions MYMETA.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@ abstract: unknown
author:
- unknown
build_requires:
ExtUtils::MakeMaker: 0
ExtUtils::MakeMaker: '0'
configure_requires:
ExtUtils::MakeMaker: 0
ExtUtils::MakeMaker: '0'
dynamic_config: 0
generated_by: 'ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.131560'
generated_by: 'ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.142690'
license: open_source
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
version: '1.4'
name: cgpCaVEManWrapper
no_index:
directory:
- t
- inc
requires:
Attribute::Abstract: 1.02
Const::Fast: 0.014
Devel::Cover: 1.09
File::Which: 0.05
List::Util: 1.38
Pod::Coverage: 0.23
Test::Fatal: 0.013
Try::Tiny: 0.19
Attribute::Abstract: '1.02'
Const::Fast: '0.014'
Devel::Cover: '1.09'
File::Which: '0.05'
List::Util: '1.38'
Pod::Coverage: '0.23'
Test::Fatal: '0.013'
Try::Tiny: '0.19'
version: v1.2.0
4 changes: 1 addition & 3 deletions bin/caveman.pl
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,12 @@ sub cleanup{

sub getSpeciesAssemblyFromBam{
my ($opts) = @_;
$opts->{'species'};
$opts->{'species-assembly'};
my ($species,$assembly) = undef;
my $bam = Bio::DB::Sam->new(-bam =>$opts->{'tumbam'});
my $head = $bam->header->text;
my @split_head = split(/\n/,$head);
foreach my $line(@split_head){
if($line =~ m/^@SQ/){
if($line =~ m/^\@SQ/){
$assembly = $line =~ /AS:([^\t]+)/;
$species = $line =~ /SP:([^\t]+)/;
last;
Expand Down
Binary file modified docs.tar.gz
Binary file not shown.

0 comments on commit a8048bd

Please sign in to comment.