Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug running merge (issue 44) #45

Merged
merged 2 commits into from
Jan 25, 2016
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
2 changes: 1 addition & 1 deletion circlator/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

class Error (Exception): pass

version = '1.1.2'
version = '1.1.3'

def syscall(cmd, allow_fail=False, verbose=False):
if verbose:
Expand Down
4 changes: 3 additions & 1 deletion circlator/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,9 @@ def _write_act_files(self, ref_fasta, qry_fasta, coords_file, outprefix):
def _iterative_bridged_contig_pair_merge(self, outprefix):
'''Iteratively merges contig pairs using bridging contigs from reassembly, until no more can be merged'''
if self.reads is None:
return self.original_fasta, self.reassembly, None, None
if self.verbose:
print('Skipping iterative contig merging because no reads given (see --reads option)')
return self.original_fasta, None, None

log_file = outprefix + '.iterations.log'
log_fh = pyfastaq.utils.open_file_write(log_file)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

setup(
name='circlator',
version='1.1.2',
version='1.1.3',
description='circlator: a tool to circularise genome assemblies',
packages = find_packages(),
package_data={'circlator': ['data/*']},
Expand Down