From 4ef61c8d2d612be1702e3dfb6ad243be4694d9c3 Mon Sep 17 00:00:00 2001 From: Martin Hunt Date: Fri, 29 May 2015 13:06:38 +0100 Subject: [PATCH 1/2] Fix bug dying when minimus2 first merge fails --- circlator/minimus2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circlator/minimus2.py b/circlator/minimus2.py index cd6308c..b9c3faa 100644 --- a/circlator/minimus2.py +++ b/circlator/minimus2.py @@ -144,8 +144,8 @@ def _run_initial_merge(self, infile, outdir): print('Error running merge. Going to use original contigs. Minimus2 errors follow...\n', file=sys.stderr) print(errors, file=sys.stderr) print('... end of Minimus2 output.\n\n', file=sys.stderr) - logging.info('Number of original contigs: ' + strlen(original_contigs)) - logging.info('Number of singleton contigs: ', 'NA') + logging.info('Number of original contigs: ' + str(len(original_contigs))) + logging.info('Number of singleton contigs: NA') logging.info('Number of contigs that were merged: NA') logging.info('Merged contigs: NA') return infile From 21d4099c7cfb207903035b0d96449cce73a93dab Mon Sep 17 00:00:00 2001 From: Martin Hunt Date: Fri, 29 May 2015 13:07:13 +0100 Subject: [PATCH 2/2] Version bump --- circlator/common.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/circlator/common.py b/circlator/common.py index 6f2de32..b6d2625 100644 --- a/circlator/common.py +++ b/circlator/common.py @@ -1,7 +1,7 @@ import sys import subprocess -version = '0.13.0' +version = '0.13.1' def syscall(cmd, allow_fail=False, verbose=False): if verbose: diff --git a/setup.py b/setup.py index b1c4b16..4c17ee9 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name='circlator', - version='0.13.0', + version='0.13.1', description='circlator: a tool to circularise bacterial genome assemblies', packages = find_packages(), package_data={'circlator': ['data/*']},