From 14eca43eac782df335adb7aeda7437bc751fa567 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Tue, 26 Mar 2019 16:17:44 +0100 Subject: [PATCH] Import taxo --- python/obitools3/dms/taxo/taxo.pxd | 6 +++--- python/obitools3/dms/taxo/taxo.pyx | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/python/obitools3/dms/taxo/taxo.pxd b/python/obitools3/dms/taxo/taxo.pxd index 0e4cbd0..a9a1284 100755 --- a/python/obitools3/dms/taxo/taxo.pxd +++ b/python/obitools3/dms/taxo/taxo.pxd @@ -1,10 +1,10 @@ #cython: language_level=3 -from ..capi.obitaxonomy cimport ecotx_t, OBIDMS_taxonomy_p +from obitools3.dms.capi.obitaxonomy cimport ecotx_t, OBIDMS_taxonomy_p -from ..dms cimport DMS +from obitools3.dms.dms cimport DMS -from ..object cimport OBIWrapper +from obitools3.dms.object cimport OBIWrapper cdef class Taxonomy(OBIWrapper) : diff --git a/python/obitools3/dms/taxo/taxo.pyx b/python/obitools3/dms/taxo/taxo.pyx index 758b7ac..5ed5ef1 100755 --- a/python/obitools3/dms/taxo/taxo.pyx +++ b/python/obitools3/dms/taxo/taxo.pyx @@ -1,8 +1,14 @@ #cython: language_level=3 from obitools3.utils cimport str2bytes, bytes2str, tobytes, tostr +from obitools3.dms.capi.obitaxonomy cimport ecotx_t, OBIDMS_taxonomy_p -from ..capi.obitaxonomy cimport obi_taxonomy_exists, \ +from obitools3.dms.dms cimport DMS +from obitools3.dms.dms import DMS + +from obitools3.dms.object cimport OBIWrapper + +from obitools3.dms.capi.obitaxonomy cimport obi_taxonomy_exists, \ obi_read_taxonomy, \ obi_read_taxdump, \ obi_write_taxonomy, \ @@ -15,7 +21,9 @@ from ..capi.obitaxonomy cimport obi_taxonomy_exists, \ obi_taxo_get_genus, \ obi_taxo_get_family, \ ecotx_t - + +from obitools3.dms.capi.obidms cimport OBIDMS_p + from cpython.pycapsule cimport PyCapsule_New, PyCapsule_GetPointer import tarfile