From fbf0f7dfb698ee351aa84f69a6f66d802e3a391d Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Wed, 17 Feb 2021 15:26:35 +1300 Subject: [PATCH] import: improved genbank parser and switch to version 3.0.0b42 --- python/obitools3/parsers/genbank.pyx | 4 ++-- python/obitools3/version.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/obitools3/parsers/genbank.pyx b/python/obitools3/parsers/genbank.pyx index 60d9bd3..3df0304 100755 --- a/python/obitools3/parsers/genbank.pyx +++ b/python/obitools3/parsers/genbank.pyx @@ -22,10 +22,10 @@ from libc.stdlib cimport free, malloc, realloc from libc.string cimport strcpy, strlen -_featureMatcher = re.compile(b'^FEATURES.+\n(?=ORIGIN)',re.DOTALL + re.M) +_featureMatcher = re.compile(b'^FEATURES.+\n(?=ORIGIN )',re.DOTALL + re.M) _headerMatcher = re.compile(b'^LOCUS.+(?=\nFEATURES)', re.DOTALL + re.M) -_seqMatcher = re.compile(b'ORIGIN.+(?=//\n)', re.DOTALL + re.M) +_seqMatcher = re.compile(b'ORIGIN .+(?=//\n)', re.DOTALL + re.M) _cleanSeq1 = re.compile(b'ORIGIN.+\n') _cleanSeq2 = re.compile(b'[ \n0-9]+') _acMatcher = re.compile(b'(?<=^ACCESSION ).+',re.M) diff --git a/python/obitools3/version.py b/python/obitools3/version.py index 9b4ad9e..29d1749 100755 --- a/python/obitools3/version.py +++ b/python/obitools3/version.py @@ -1,5 +1,5 @@ major = 3 minor = 0 -serial= '0b41' +serial= '0b42' version ="%d.%d.%s" % (major,minor,serial)