Commit c7ceb51607dc20e3209bf0195fff5dec5abf50c2 - roary

+0

-1

.gitignore less more

32	32	extras/
33	33	bin/shred_assemblies
34	34	Bio-Roary-*
35		Roary-*

+59

-0

bin/roary-create_pan_genome_plots.R less more

	0	#!/usr/bin/env Rscript
	1	# ABSTRACT: Create R plots
	2	# PODNAME: create_plots.R
	3	# Take the output files from the pan genome pipeline and create nice plots.
	4	library(ggplot2)
	5
	6
	7	mydata = read.table("number_of_new_genes.Rtab")
	8	boxplot(mydata, data=mydata, main="Number of new genes",
	9	xlab="No. of genomes", ylab="No. of genes",varwidth=TRUE, ylim=c(0,max(mydata)), outline=FALSE)
	10
	11	mydata = read.table("number_of_conserved_genes.Rtab")
	12	boxplot(mydata, data=mydata, main="Number of conserved genes",
	13	xlab="No. of genomes", ylab="No. of genes",varwidth=TRUE, ylim=c(0,max(mydata)), outline=FALSE)
	14
	15	mydata = read.table("number_of_genes_in_pan_genome.Rtab")
	16	boxplot(mydata, data=mydata, main="No. of genes in the pan-genome",
	17	xlab="No. of genomes", ylab="No. of genes",varwidth=TRUE, ylim=c(0,max(mydata)), outline=FALSE)
	18
	19	mydata = read.table("number_of_unique_genes.Rtab")
	20	boxplot(mydata, data=mydata, main="Number of unique genes",
	21	xlab="No. of genomes", ylab="No. of genes",varwidth=TRUE, ylim=c(0,max(mydata)), outline=FALSE)
	22
	23	mydata = read.table("blast_identity_frequency.Rtab")
	24	plot(mydata,main="Number of blastp hits with different percentage identity", xlab="Blast percentage identity", ylab="No. blast results")
	25
	26
	27	library(ggplot2)
	28	conserved = colMeans(read.table("number_of_conserved_genes.Rtab"))
	29	total = colMeans(read.table("number_of_genes_in_pan_genome.Rtab"))
	30
	31	genes = data.frame( genes_to_genomes = c(conserved,total),
	32	genomes = c(c(1:length(conserved)),c(1:length(conserved))),
	33	Key = c(rep("Conserved genes",length(conserved)), rep("Total genes",length(total))) )
	34
	35	ggplot(data = genes, aes(x = genomes, y = genes_to_genomes, group = Key, linetype=Key)) +geom_line()+
	36	theme_classic() +
	37	ylim(c(1,max(total)))+
	38	xlim(c(1,length(total)))+
	39	xlab("No. of genomes") +
	40	ylab("No. of genes")+ theme_bw(base_size = 16) + theme(legend.justification=c(0,1),legend.position=c(0,1))+
	41	ggsave(filename="conserved_vs_total_genes.png", scale=1)
	42
	43	######################
	44
	45	unique_genes = colMeans(read.table("number_of_unique_genes.Rtab"))
	46	new_genes = colMeans(read.table("number_of_new_genes.Rtab"))
	47
	48	genes = data.frame( genes_to_genomes = c(unique_genes,new_genes),
	49	genomes = c(c(1:length(unique_genes)),c(1:length(unique_genes))),
	50	Key = c(rep("Unique genes",length(unique_genes)), rep("New genes",length(new_genes))) )
	51
	52	ggplot(data = genes, aes(x = genomes, y = genes_to_genomes, group = Key, linetype=Key)) +geom_line()+
	53	theme_classic() +
	54	ylim(c(1,max(unique_genes)))+
	55	xlim(c(1,length(unique_genes)))+
	56	xlab("No. of genomes") +
	57	ylab("No. of genes")+ theme_bw(base_size = 16) + theme(legend.justification=c(1,1),legend.position=c(1,1))+
	58	ggsave(filename="unique_vs_new_genes.png", scale=1)

+19

-0

bin/roary-pan_genome_reorder_spreadsheet less more

	0	#!/usr/bin/env perl
	1
	2	package Bio::Roary::Main::RoaryReorderSpreadsheet;
	3
	4	# ABSTRACT: Take in a tree and a spreadsheet and output a reordered spreadsheet
	5	# PODNAME: pan_genome_reorder_spreadsheet
	6
	7	=head1 SYNOPSIS
	8
	9	Take in a tree and a spreadsheet and output a reordered spreadsheet
	10
	11	=cut
	12
	13	use Cwd qw(abs_path);
	14	BEGIN { unshift( @INC, abs_path('./lib') ) }
	15	BEGIN { unshift( @INC, abs_path('./t/lib') ) }
	16	use Bio::Roary::CommandLine::RoaryReorderSpreadsheet;
	17
	18	Bio::Roary::CommandLine::RoaryReorderSpreadsheet->new(args => \@ARGV, script_name => $0)->run;

+19

-0

bin/roary-query_pan_genome less more

	0	#!/usr/bin/env perl
	1
	2	package Bio::Roary::Main::QueryRoary;
	3
	4	# ABSTRACT: Take in a groups file and the protein fasta files and output selected data
	5	# PODNAME: query_pan_genome
	6
	7	=head1 SYNOPSIS
	8
	9	Take in a groups file and the protein fasta files and output selected data
	10
	11	=cut
	12
	13	use Cwd qw(abs_path);
	14	BEGIN { unshift( @INC, abs_path('./lib') ) }
	15	BEGIN { unshift( @INC, abs_path('./t/lib') ) }
	16	use Bio::Roary::CommandLine::QueryRoary;
	17
	18	Bio::Roary::CommandLine::QueryRoary->new(args => \@ARGV, script_name => $0)->run;

+27

-0

debian/changelog less more

	0	roary (3.6.1+dfsg-2) unstable; urgency=medium
	1
	2	* Use correct argument format for easy_init to get rid of warning message.
	3	* Bump Standards-Version.
	4
	5	-- Sascha Steinbiss <sascha@steinbiss.name> Sat, 30 Apr 2016 10:52:10 +0000
	6
	7	roary (3.6.1+dfsg-1) unstable; urgency=medium
	8
	9	* New upstream release.
	10
	11	-- Sascha Steinbiss <sascha@steinbiss.name> Wed, 20 Apr 2016 09:24:16 +0000
	12
	13	roary (3.6.0+dfsg-4) unstable; urgency=medium
	14
	15	* Remove patch for PRANK.
	16	* Disable tests due to nondeterminism until upstream has fixed the issue.
	17
	18	-- Sascha Steinbiss <sascha@steinbiss.name> Wed, 06 Apr 2016 23:31:55 +0000
	19
	20	roary (3.6.0+dfsg-3) unstable; urgency=medium
	21
	22	* Attempt to fix FTBFS in reproducibility tests by choosing a
	23	fixed random seed for PRANK.
	24
	25	-- Sascha Steinbiss <sascha@steinbiss.name> Mon, 04 Apr 2016 17:02:10 +0000
	26
0	27	roary (3.6.0+dfsg-2~bpo8+1) jessie-backports; urgency=medium
1	28
2	29	* Add a workaround for #808552 to allow building on jessie

+1

-1

debian/control less more

35	35	mafft,
36	36	fasttree
37	37	Build-Depends-Indep: perl
38		Standards-Version: 3.9.7
	38	Standards-Version: 3.9.8
39	39	Testsuite: autopkgtest
40	40	Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/roary.git
41	41	Vcs-Git: https://anonscm.debian.org/git/debian-med/roary.git

+22

-0

debian/patches/fix_log_message.patch less more

	0	Description: use correct parameter for easy_init
	1	The original code triggered a warning message in newer log4perl
	2	versions, breaking the autopkgtest.
	3	Author: Sascha Steinbiss <sascha@steinbiss.name>
	4	--- a/lib/Bio/Roary/CommandLine/Common.pm
	5	+++ b/lib/Bio/Roary/CommandLine/Common.pm
	6	@@ -19,7 +19,7 @@
	7	sub _build_logger
	8	{
	9	my ($self) = @_;
	10	- Log::Log4perl->easy_init(level => $ERROR);
	11	+ Log::Log4perl->easy_init($ERROR);
	12	my $logger = get_logger();
	13	return $logger;
	14	}
	15	@@ -54,4 +54,4 @@
	16	};
	17
	18	no Moose;
	19	-1;
	20	\ No newline at end of file
	21	+1;

+63

-0

debian/patches/prank_seed.patch less more

	0	Description: make PRANK honour SOURCE_DATE_EPOCH
	1	For reproducibility, the -seed parameter in PRANK is set to a fixed
	2	time instead of the default system time. This is expected to fix
	3	some failing tests.
	4	Author: Sascha Steinbiss <sascha@steinbiss.name>
	5	--- a/lib/Bio/Roary/External/Prank.pm
	6	+++ b/lib/Bio/Roary/External/Prank.pm
	7	@@ -22,6 +22,7 @@
	8	has 'input_filename' => ( is => 'ro', isa => 'Str', required => 1 );
	9	has 'output_filename' => ( is => 'ro', isa => 'Str', default => 'output' );
	10	has 'exec' => ( is => 'ro', isa => 'Str', default => 'prank' );
	11	+has 'seed' => ( is => 'rw', isa => 'Int', default => 0 );
	12
	13	# Overload Role
	14	has 'memory_in_mb' => ( is => 'ro', isa => 'Int', lazy => 1, builder => '_build_memory_in_mb' );
	15	@@ -34,18 +35,26 @@
	16
	17	sub _command_to_run {
	18	my ($self) = @_;
	19	-
	20	+ my ($repstr) = "";
	21	+ if ($ENV{"SOURCE_DATE_EPOCH"})
	22	+ {
	23	+ $self->seed($ENV{"SOURCE_DATE_EPOCH"} + 0);
	24	+ }
	25	if(! -e $self->input_filename)
	26	{
	27	$self->logger->error( "Input file to PRANK missing: " . $self->input_filename );
	28	}
	29	-
	30	+ if($self->seed > 0)
	31	+ {
	32	+ $repstr = "-reproducible -seed=" . $self->seed;
	33	+ }
	34	return join(
	35	' ',
	36	(
	37	$self->exec,
	38	"-d=" . $self->input_filename,
	39	"-o=" . $self->output_filename,
	40	+ $repstr,
	41	'-codon', '-F', '-quiet', '-once', '> /dev/null 2>&1',
	42	'&&', 'mv', $self->output_filename . '*.fas',
	43	$self->output_filename
	44	--- a/t/Bio/Roary/External/Prank.t
	45	+++ b/t/Bio/Roary/External/Prank.t
	46	@@ -22,11 +22,11 @@
	47	'initialise prank obj'
	48	);
	49
	50	-is(
	51	- $obj->_command_to_run,
	52	-'prank -d=t/data/prank_input.fa -o=t/data/prank_input.fa.aln -codon -F -quiet -once > /dev/null 2>&1 && mv t/data/prank_input.fa.aln*.fas t/data/prank_input.fa.aln',
	53	- 'Command constructed as expected'
	54	-);
	55	+#is(
	56	+# $obj->_command_to_run,
	57	+#'prank -d=t/data/prank_input.fa -o=t/data/prank_input.fa.aln -codon -F -quiet -once > /dev/null 2>&1 && mv t/data/prank_input.fa.aln*.fas t/data/prank_input.fa.aln',
	58	+# 'Command constructed as expected'
	59	+#);
	60
	61	ok( $obj->run(), 'run prank' );
	62

+1

-0

debian/patches/series less more

0	0	rename_R_script.patch
	1	fix_log_message.patch

+3

-2

debian/rules less more

0	0	#!/usr/bin/make -f
1
2		# DH_VERBOSE := 1
3	1
4	2	# work around #808552, which still affects Debian 8
5	3	export DZIL_GLOBAL_CONFIG_ROOT=/sbuild-nonexistent

10	8	override_dh_dzil_build:
11	9	mv bin/create_pan_genome_plots.R bin/create_pan_genome_plots
12	10	dh_dzil_build --
	11
	12	override_dh_auto_test:
	13	# pass

+1

-1

dist.ini less more

0	0	name = Bio-Roary
1		version = 3.6.0
	1	version = 3.6.1
2	2	author = Andrew J. Page <ap13@sanger.ac.uk>
3	3	license = GPL_3
4	4	copyright_holder = Wellcome Trust Sanger Institute