Merge branch 'hotfix/v3.1.1'

bin/Admin_GeneRegionBedDumper.pl

@@ -106,8 +106,8 @@
 		my $rawFile = $rawFileNames[$i];
 		my $sortedFile = $sortedFileNames[$i];
 		my $finalFile = $finalFileNames[$i];
-		my $sortCmd = '/software/CGP/bin/bedtools sort -i '.$rawFile.' > '.$sortedFile;
-		my $mergeCmd = '/software/CGP/bin/bedtools merge -i '.$sortedFile.' > '.$finalFile;
+		my $sortCmd = 'bedtools sort -i '.$rawFile.' > '.$sortedFile;
+		my $mergeCmd = 'bedtools merge -i '.$sortedFile.' > '.$finalFile;
 
     my ($sortOUT,$sortERR,$sortEXIT) = capture{ system($sortCmd) };
     croak("bedtools sort command failed : $sortCmd\n $sortERR") unless $sortEXIT == 0;

bin/AnnotateVcf.pl

@@ -2,21 +2,21 @@
 
 ##########LICENCE##########
 # Copyright (c) 2014 Genome Research Ltd.
-# 
+#
 # Author: Cancer Genome Project [email protected]
-# 
+#
 # This file is part of VAGrENT.
-# 
+#
 # VAGrENT is free software: you can redistribute it and/or modify it under
 # the terms of the GNU Affero General Public License as published by the Free
 # Software Foundation; either version 3 of the License, or (at your option) any
 # later version.
-# 
+#
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
 # details.
-# 
+#
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 ##########LICENCE##########
@@ -87,7 +87,7 @@
 
 eval {
   my $options = option_builder();
-  Vcf::validate($options->{'input'});
+  Vcf::validate($options->{'input'}) unless($options->{'novalidate'});
   my $vcf_in = Vcf->new( file => $options->{'input'} );
   unless(defined $options->{'species'} && defined $options->{'assembly'}) {
     croak 'unable to determine species and assembly from VCF file, please specify on command line' unless find_species_in_vcf($vcf_in,$options);
@@ -102,7 +102,7 @@
 
   process_data($vcf_in,$OUT_FH,$annotator,$options);
   close $OUT_FH or croak 'Failed to close: '.$output;
-  Vcf::validate($output);
+  Vcf::validate($output) unless($options->{'novalidate'});
 
   if($options->{'tabix'}){
     compressAndIndex($options,$output);
@@ -118,20 +118,20 @@
 
 sub compressAndIndex {
   my ($options, $tmpfile) = @_;
-  
+
   my $sort_cmd = sprintf $SORT_CMD, $tmpfile, $options->{'output'};
   my $bgzip_cmd = sprintf $BGZIP_CMD, $options->{'output'};
   my $totabix = $options->{'output'} .'.gz';
   my $tabix_cmd = sprintf $TABIX_CMB, $totabix;
-  
+
   try {
     my $tabix_in = $options->{'input'}.'.tbx';
     unless(-e $tabix_in){
-      # If the input has a tabix index it must have already been sorted, 
+      # If the input has a tabix index it must have already been sorted,
       # we haven't changed the order of the file so we can skip this sort
       system($sort_cmd);
     }
-    
+
   } catch {
     warn "EXECUTION ERROR: $sort_cmd\n";
     die $_;
@@ -156,7 +156,7 @@ sub compressAndIndex {
 
 sub process_data {
   my ($in,$out,$anno,$opts) = @_;
-  print $out generate_header($in,$opts);
+  print $out generate_header($in,$opts) unless($opts->{'novalidate'});
   my $c = 0;
   while(my $record = $in->next_data_array) {
     $c++;
@@ -195,7 +195,7 @@ sub generate_annotation {
         $rec->[$INFO_COL] = $vcf->add_info_field($rec->[$INFO_COL], 'VC' => $annotator->getOntologySummary($worst));
       }
     }
-  } 
+  }
   return;
 }
 
@@ -206,7 +206,7 @@ sub annotate {
     @annotationGroups = $annotator->getAnnotation($var);
   } catch {
       warn "caught error: $_\n"; # not $@
-  };  
+  };
   return @annotationGroups;
 }
 
@@ -462,6 +462,7 @@ sub option_builder {
     'o|output=s' => \$opts{'output'},
     'c|cache=s' => \$opts{'cache'},
     't|tabix' => \$opts{'tabix'},
+    'n|novalid' => \$opts{'novalidate'},
     'p|process=n' => \$opts{'process'},
     'sp|species=s' => \$opts{'species'},
     'as|assembly=s' => \$opts{'assembly'},
@@ -486,7 +487,7 @@ sub option_builder {
 	pod2usage(q{'-c' is an empty file}) unless(-s $opts{'cache'});
 
 	pod2usage(q{'-o' must be defined}) unless($opts{'output'});
-	
+
   return \%opts;
 }
 
@@ -518,6 +519,11 @@ =head1 SYNOPSIS
 
   Optional
 
+    --novalid   (-n)      Don't validate the input/output VCF
+                            - Allows unheaded tsv file with VCF column format, cols
+                              - 1-6 required, 7-11 as '.'
+                            - Does not generate a valid VCF
+
     --version   (-v)      Output version number
 
     --process   (-p)      ID_PROCESS that generated this file

lib/Sanger/CGP/Vagrent.pm

@@ -26,7 +26,7 @@ use strict;
 use Const::Fast qw(const);
 
 use base 'Exporter';
-our $VERSION = '3.1.0';
+our $VERSION = '3.1.1';
 our @EXPORT = qw($VERSION);
 
 1;