From a7dcf16c06ddef29439bce71b805698f7016d1ef Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Wed, 20 May 2020 15:59:04 +0200 Subject: [PATCH] Minor changes for pip release --- python/obitools3/dms/capi/obidmscolumn.pxd | 2 ++ python/obitools3/dms/column/column.pyx | 11 +++++++++-- python/obitools3/version.py | 2 +- setup.py | 11 +++++++++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/python/obitools3/dms/capi/obidmscolumn.pxd b/python/obitools3/dms/capi/obidmscolumn.pxd index 75968da..21b44f8 100755 --- a/python/obitools3/dms/capi/obidmscolumn.pxd +++ b/python/obitools3/dms/capi/obidmscolumn.pxd @@ -63,6 +63,8 @@ cdef extern from "obidmscolumn.h" nogil: char* obi_get_elements_names(OBIDMS_column_p column) + char* obi_column_formatted_infos(OBIDMS_column_p column) + index_t obi_column_get_element_index_from_name(OBIDMS_column_p column, const char* element_name) int obi_column_write_comments(OBIDMS_column_p column, const char* comments) diff --git a/python/obitools3/dms/column/column.pyx b/python/obitools3/dms/column/column.pyx index ac3ce23..ab77a74 100755 --- a/python/obitools3/dms/column/column.pyx +++ b/python/obitools3/dms/column/column.pyx @@ -14,6 +14,7 @@ from ..capi.obidms cimport obi_import_column from ..capi.obidmscolumn cimport OBIDMS_column_header_p, \ obi_close_column, \ obi_get_elements_names, \ + obi_column_formatted_infos, \ obi_column_write_comments from ..capi.obiutils cimport obi_format_date @@ -38,7 +39,7 @@ from obitools3.utils cimport tobytes, \ from obitools3.dms.column import typed_column -from libc.stdlib cimport free +from libc.stdlib cimport free import importlib import inspect @@ -288,9 +289,15 @@ cdef class Column(OBIWrapper) : @OBIWrapper.checkIsActive def __repr__(self) : cdef bytes s + #cdef char* s_b + #cdef str s_str + #s_b = obi_column_formatted_infos(self.pointer()) + #s_str = bytes2str(s_b) + #free(s_b) s = self._alias + b", data type: " + self.data_type + #return s_str return bytes2str(s) - + def close(self): # TODO discuss, can't be called bc then bug when closing view that tries to close it in C diff --git a/python/obitools3/version.py b/python/obitools3/version.py index 55eab38..9ef969c 100755 --- a/python/obitools3/version.py +++ b/python/obitools3/version.py @@ -1,5 +1,5 @@ major = 3 minor = 0 -serial= '0b19' +serial= '0b20' version ="%d.%d.%s" % (major,minor,serial) diff --git a/setup.py b/setup.py index 7e05fc3..299ccfd 100755 --- a/setup.py +++ b/setup.py @@ -89,9 +89,10 @@ PACKAGE = "OBITools3" VERSION = version AUTHOR = 'Celine Mercier' EMAIL = 'celine.mercier@metabarcoding.org' -URL = "http://metabarcoding.org/obitools3" +URL = "https://metabarcoding.org/obitools3" +PLATFORMS = "posix" LICENSE = "CeCILL-V2" -DESCRIPTION = "Tools and library for DNA metabarcoding", +DESCRIPTION = "A package for the management of analyses and data in DNA metabarcoding." PYTHONMIN = '3.5' SRC = 'python' @@ -148,12 +149,18 @@ classifiers=['Development Status :: 4 - Beta', 'Topic :: Utilities', ] +with open("README.md", "r") as fh: + long_description = fh.read() + setup(name=PACKAGE, description=DESCRIPTION, + long_description=long_description, + long_description_content_type="text/markdown", classifiers=classifiers, version=VERSION, author=AUTHOR, author_email=EMAIL, + platforms=PLATFORMS, license=LICENSE, url=URL, ext_modules=xx,