From 9100e14899a0e6078e598226fee5de0208d8a913 Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Fri, 3 Jul 2020 17:36:57 +0200 Subject: [PATCH] obi uniq: quick fix for bug where some sequences are not correctly dereplicated --- python/obitools3/commands/uniq.pyx | 4 +++- python/obitools3/version.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/python/obitools3/commands/uniq.pyx b/python/obitools3/commands/uniq.pyx index d8f6f93..3b8cc22 100644 --- a/python/obitools3/commands/uniq.pyx +++ b/python/obitools3/commands/uniq.pyx @@ -307,7 +307,8 @@ cdef uniq_sequences(View_NUC_SEQS view, View_NUC_SEQS o_view, ProgressBar pb, di for x in categories : catl.append(i_seq[x]) - unique_id = tuple(catl) + (i_seq_col.get_line_idx(i),) + unique_id = tuple(catl) + (i_seq_col[i],) + #unique_id = tuple(catl) + (i_seq_col.get_line_idx(i),) #unique_id = tuple(i_seq[x] for x in categories) + (seq_col.get_line_idx(i),) # The line that cython can't read properly if unique_id in uniques: @@ -453,6 +454,7 @@ cdef uniq_sequences(View_NUC_SEQS view, View_NUC_SEQS o_view, ProgressBar pb, di merged_dict[mkey] = {} for i_idx in merged_sequences: + PyErr_CheckSignals() pb(total_treated) i_id = i_id_col[i_idx] diff --git a/python/obitools3/version.py b/python/obitools3/version.py index ecb2262..e88a4bc 100755 --- a/python/obitools3/version.py +++ b/python/obitools3/version.py @@ -1,5 +1,5 @@ major = 3 minor = 0 -serial= '0b26a' +serial= '0b26b' version ="%d.%d.%s" % (major,minor,serial)