From ce4ffc8f2207d20f4c49ed5f6fa97c067a2a269b Mon Sep 17 00:00:00 2001 From: Lianming Du Date: Sat, 25 Nov 2023 16:34:47 +0800 Subject: [PATCH] fixed subsequence none --- docs/changelog.rst | 5 +++++ setup.py | 4 ++-- src/sequence.c | 10 ++++++---- src/version.h | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index de85a29..cce5f58 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,11 @@ Changelog ========= +Version 2.0.2 (2023-11-25) +-------------------------- + +- Fixed subsequence return None error + Version 2.0.1 (2023-09-18) -------------------------- diff --git a/setup.py b/setup.py index a7d47e2..7f7a26c 100644 --- a/setup.py +++ b/setup.py @@ -75,7 +75,7 @@ def prepare_indexed_gzip(): ]) if sys.platform.startswith('linux'): - link_args.extend(['-lz', '-lsqlite3']) + link_args.extend(['-lsqlite3']) comp_args.extend([ '-D_LFS64_LARGEFILE', '-D_LARGEFILE64_SOURCE', @@ -85,9 +85,9 @@ def prepare_indexed_gzip(): comp_args.append('-DHAVE_UNISTD_H') if not sys.platform.startswith('linux'): - prepare_zlib() prepare_sqlite3() +prepare_zlib() prepare_indexed_gzip() extension = Extension('pyfastx', diff --git a/src/sequence.c b/src/sequence.c index 834a933..7365ae5 100644 --- a/src/sequence.c +++ b/src/sequence.c @@ -457,16 +457,18 @@ PyObject *pyfastx_sequence_subscript(pyfastx_Sequence* self, PyObject* item){ // return NULL; //} - if (slice_len <= 0) { - Py_RETURN_NONE; - } + //if (slice_len <= 0) { + // Py_RETURN_NONE; + //} if (slice_step == 0) { PyErr_SetString(PyExc_ValueError, "slice step cannot be zero"); + return NULL; } if (slice_step != 1) { - Py_RETURN_NONE; + PyErr_SetString(PyExc_ValueError, "slice step cannot > 1"); + return NULL; } //create a new sequence diff --git a/src/version.h b/src/version.h index 91e652f..a70219c 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define PYFASTX_VERSION "2.0.1" +#define PYFASTX_VERSION "2.0.2" #define ZRAN_VERSION "1.7.0" \ No newline at end of file