From 10ab55725987260f1508b7d0be8fae0bb4f70e56 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Tue, 26 Mar 2019 15:40:31 +0100 Subject: [PATCH 01/14] First version of the simplified setup.py script --- Makefile | 33 ----- python/obitools3/apps/temp.pxd | 2 - python/obitools3/apps/temp.pyx | 3 + python/obitools3/dms/column/column.pxd | 17 ++- python/obitools3/dms/column/column.pyx | 26 ++-- python/obitools3/dms/column/column_idx.pxd | 5 +- python/obitools3/dms/column/column_idx.pyx | 11 +- python/obitools3/utils.pxd | 2 +- python/obitools3/utils.pyx | 3 +- setup.py | 165 +++++++++++++-------- src/CMakeLists.txt | 61 ++++++++ 11 files changed, 202 insertions(+), 126 deletions(-) delete mode 100644 Makefile create mode 100644 src/CMakeLists.txt diff --git a/Makefile b/Makefile deleted file mode 100644 index 20b0e8d..0000000 --- a/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -ifeq ($(CC),gcc) - LFLAGS = -fopenmp -else - LFLAGS = -endif - -SOURCE_DIR := src -ENV_DIR := $(abspath .) -OBJ_DIR := $(ENV_DIR)/obi_objdir -LIB_DIR := $(ENV_DIR)/obi_libdir - -SOURCE_FILES = $(SOURCE_DIR)/libecoPCR/libapat/*.c $(SOURCE_DIR)/libecoPCR/libthermo/*.c $(SOURCE_DIR)/libecoPCR/*.c $(SOURCE_DIR)/libjson/*.c $(SOURCE_DIR)/*.c -OBJ_FILES = $(OBJ_DIR)/*.o -DYN_LIB_FILES = $(LIB_DIR)/libobi3.so - -all: $(DYN_LIB_FILES) - -$(LIB_DIR): - mkdir -p $(LIB_DIR) - -$(OBJ_DIR): - mkdir -p $(OBJ_DIR) - -$(DYN_LIB_FILES): $(OBJ_FILES) | $(LIB_DIR) - $(CC) -shared -o $@ $^ - -$(OBJ_FILES): | $(OBJ_DIR) - $(CC) $(LFLAGS) -fpic -c $(SOURCE_FILES) - mv *.o $(OBJ_DIR) - -clean: - rm -rf $(LIB_DIR) - rm -rf $(OBJ_DIR) diff --git a/python/obitools3/apps/temp.pxd b/python/obitools3/apps/temp.pxd index 252e41d..2c6c690 100755 --- a/python/obitools3/apps/temp.pxd +++ b/python/obitools3/apps/temp.pxd @@ -6,5 +6,3 @@ Created on 28 juillet 2017 @author: coissac ''' -from obitools3.dms.dms cimport DMS -from obitools3.utils cimport tobytes,tostr \ No newline at end of file diff --git a/python/obitools3/apps/temp.pyx b/python/obitools3/apps/temp.pyx index eb01da8..996189a 100755 --- a/python/obitools3/apps/temp.pyx +++ b/python/obitools3/apps/temp.pyx @@ -17,6 +17,9 @@ from obitools3.dms.dms import DMS from obitools3.apps.config import getConfiguration from obitools3.apps.config import logger +from obitools3.dms.dms cimport DMS +from obitools3.utils cimport tobytes,tostr + cpdef get_temp_dir(): """ Returns a temporary directory object specific of this instance of obitools. diff --git a/python/obitools3/dms/column/column.pxd b/python/obitools3/dms/column/column.pxd index 7e68906..2dd5e14 100755 --- a/python/obitools3/dms/column/column.pxd +++ b/python/obitools3/dms/column/column.pxd @@ -1,14 +1,21 @@ #cython: language_level=3 +from obitools3.dms.capi.obitypes cimport index_t, \ + name_data_type, \ + obitype_t, \ + obiversion_t, \ + OBI_QUAL -from ..capi.obitypes cimport index_t, \ - obitype_t +from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_header_p, \ + obi_close_column, \ + obi_get_elements_names, \ + obi_column_write_comments -from ..capi.obidmscolumn cimport OBIDMS_column_p +from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p -from ..view.view cimport View +from obitools3.dms.view.view cimport View -from ..object cimport OBIWrapper +from obitools3.dms.object cimport OBIWrapper cdef dict __OBIDMS_COLUMN_CLASS__ diff --git a/python/obitools3/dms/column/column.pyx b/python/obitools3/dms/column/column.pyx index aae7f71..fdc338d 100755 --- a/python/obitools3/dms/column/column.pyx +++ b/python/obitools3/dms/column/column.pyx @@ -3,27 +3,31 @@ __OBIDMS_COLUMN_CLASS__ = {} +from obitools3.dms.object cimport OBIWrapper +from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p +from obitools3.dms.capi.obitypes cimport index_t, \ + name_data_type, \ + obitype_t, \ + obiversion_t, \ + OBI_QUAL -from ..capi.obitypes cimport name_data_type, \ - obitype_t, \ - obiversion_t, \ - OBI_QUAL - -from ..capi.obidms cimport obi_import_column - -from ..capi.obidmscolumn cimport OBIDMS_column_header_p, \ +from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_header_p, \ obi_close_column, \ obi_get_elements_names, \ obi_column_write_comments + +from obitools3.dms.capi.obidms cimport obi_import_column +from obitools3.dms.view.view cimport View + -from ..capi.obiutils cimport obi_format_date +from obitools3.dms.capi.obiutils cimport obi_format_date -from ..capi.obiview cimport obi_view_add_column, \ +from obitools3.dms.capi.obiview cimport obi_view_add_column, \ obi_view_get_pointer_on_column_in_view, \ Obiview_p, \ NUC_SEQUENCE_COLUMN -from ..object cimport OBIDeactivatedInstanceError +from obitools3.dms.object cimport OBIDeactivatedInstanceError from obitools3.utils cimport tobytes, \ bytes2str, \ diff --git a/python/obitools3/dms/column/column_idx.pxd b/python/obitools3/dms/column/column_idx.pxd index c07c9b7..d0758c7 100755 --- a/python/obitools3/dms/column/column_idx.pxd +++ b/python/obitools3/dms/column/column_idx.pxd @@ -1,10 +1,7 @@ # #cython: language_level=3 -from ..capi.obitypes cimport index_t - -from .column cimport Column, \ - Column_multi_elts +from obitools3.dms.capi.obitypes cimport index_t cdef class Column_idx(Column) : diff --git a/python/obitools3/dms/column/column_idx.pyx b/python/obitools3/dms/column/column_idx.pyx index da1bb06..a666bf8 100755 --- a/python/obitools3/dms/column/column_idx.pyx +++ b/python/obitools3/dms/column/column_idx.pyx @@ -2,23 +2,26 @@ from obitools3.dms.capi.obierrno cimport obi_errno -from ..view.view cimport View +from obitools3.dms.view.view cimport View from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from ..capi.obiview cimport obi_get_index_with_elt_name_and_col_p_in_view, \ +from obitools3.dms.capi.obiview cimport obi_get_index_with_elt_name_and_col_p_in_view, \ obi_get_index_with_elt_idx_and_col_p_in_view, \ obi_set_index_with_elt_name_and_col_p_in_view, \ obi_set_index_with_elt_idx_and_col_p_in_view, \ Obiview_p -from ..capi.obidmscolumn cimport OBIDMS_column_p +from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p -from ..capi.obitypes cimport OBI_IDX, OBIIdx_NA, index_t +from obitools3.dms.capi.obitypes cimport OBI_IDX, OBIIdx_NA, index_t from cpython.long cimport PyLong_FromLongLong +from obitools3.dms.column.column cimport Column, \ + Column_multi_elts + # TODO overwrite other functions from Column and Column_multi_elts diff --git a/python/obitools3/utils.pxd b/python/obitools3/utils.pxd index 53d3765..443bc73 100755 --- a/python/obitools3/utils.pxd +++ b/python/obitools3/utils.pxd @@ -1,4 +1,4 @@ -#cython: language_level=3 +# cython: language_level=3 from obitools3.dms.capi.obitypes cimport obitype_t, index_t diff --git a/python/obitools3/utils.pyx b/python/obitools3/utils.pyx index d3a1526..4d0a946 100755 --- a/python/obitools3/utils.pyx +++ b/python/obitools3/utils.pyx @@ -1,4 +1,5 @@ -#cython: language_level=3 +# cython: language_level=3 +# distutils: include_dirs = src from obitools3.dms.capi.obitypes cimport is_a_DNA_seq, \ OBI_VOID, \ diff --git a/setup.py b/setup.py index 2d1758e..7951863 100755 --- a/setup.py +++ b/setup.py @@ -1,87 +1,122 @@ -#!/usr/bin/env python - +import glob +import os import sys +import re +import subprocess + +from distutils.core import setup,Extension +from distutils.sysconfig import get_python_lib +from Cython.Build import cythonize + +import os.path +from distutils import log +from distutils.extension import Extension + +sys.path.append(os.path.abspath("python")) + +print(sys.path) + +def findPackage(root,base=None): + modules=[] + if base is None: + base=[] + for module in (os.path.basename(os.path.dirname(x)) + for x in glob.glob(os.path.join(root,'*','__init__.py'))): + modules.append('.'.join(base+[module])) + modules.extend(findPackage(os.path.join(root,module),base+[module])) + return modules + PACKAGE = "OBITools3" VERSION = "0.0.0" AUTHOR = 'Eric Coissac' -EMAIL = 'eric@coissac.eu' -URL = 'metabarcoding.org/obitools3' -LICENSE = 'CeCILL-V2' -DESCRIPTION ="Scripts and library for DNA metabarcoding", +EMAIL = 'eric@metabarcoding.org' +URL = "metabarcoding.org/obitools3" +LICENSE = "CeCILL-V2" +DESCRIPTION = "Tools and library for DNA metabarcoding", +PYTHONMIN = '3.6' SRC = 'python' CSRC = 'src' +REQUIRES = ['Cython>=0.24', + 'Sphinx>=1.2.0', + 'ipython>=3.0.0', + 'breathe>=4.0.0' + ] + +os.environ['CFLAGS'] = '-O3 -Wall -I "src" -I "src/libecoPCR" -I "src/libjson"' + +#sys.path.append("/Users/coissac/git/obitools3/python") + +cython_src = [x for x in glob.iglob('python/obitools3/**/*.pyx', + recursive=True + ) + ] + + + +#with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as f: +# readme = f.read() + +install_clibdir_option="-DPYTHONLIB:STRING='%s'" % get_python_lib() + +subprocess.call(['cmake', install_clibdir_option, 'src']) +subprocess.call(['make', '-C', 'src','install']) + + +cython_ext = [Extension('.'.join(["obitools3", + os.path.basename(os.path.dirname(x)), + os.path.splitext(os.path.basename(x))[0]]), + [x], + library_dirs=[get_python_lib()], + include_dirs=["src","src/libecoPCR","src/libjson"], + libraries=["cobitools3"], + runtime_library_dirs=[get_python_lib()], + extra_compile_args=['-msse2', + '-Wno-unused-function', + '-Wmissing-braces', + '-Wchar-subscripts', + '-fPIC' + ], + extra_link_args=["-Wl,-rpath,"+get_python_lib(), + "-L"+get_python_lib() + ] + ) + for x in cython_src + ] + + +xx = cythonize(cython_ext, + language_level=3, + annotate=True) + +#, include_path=["src","src/libecoPCR","src/libjson"] + classifiers=['Development Status :: 1 - Planning', 'Environment :: Console', 'Intended Audience :: Science/Research', 'License :: Other/Proprietary License', 'Operating System :: Unix', - 'Programming Language :: Python', 'Programming Language :: Python :: 3', + 'Programming Language :: C', 'Topic :: Scientific/Engineering :: Bio-Informatics', 'Topic :: Utilities', ] -PYTHONMIN='3.4' - -sys.path.append('distutils.ext') -sys.path.append(SRC) - -if __name__=="__main__": - - import sys - - print("----------------") - print(" ".join(sys.argv)) - print("----------------") - - # - # Horrible hack - # - - if sys.argv[0]=="-c": - sys.argv[0]="setup.py" - - # - # End of the horrible hack - # - - - - try: - from obitools3 import version - VERSION = version.version - except ImportError: - pass - - from obidistutils.serenity import serenity_mode - - serenity=serenity_mode(PACKAGE,VERSION) - - from obidistutils.core import setup - from obidistutils.core import CTOOLS - from obidistutils.core import CEXES - from obidistutils.core import FILES - - # Produce annotated html files - import Cython.Compiler.Options - Cython.Compiler.Options.annotate = True - - - setup(name=PACKAGE, - description=DESCRIPTION, - classifiers=classifiers, - version=VERSION, - author=AUTHOR, - author_email=EMAIL, - license=LICENSE, - url=URL, - python_src=SRC, - sse='sse2', - serenity=serenity, - pythonmin=PYTHONMIN) +setup(name=PACKAGE, + description=DESCRIPTION, + classifiers=classifiers, + version=VERSION, + author=AUTHOR, + author_email=EMAIL, + license=LICENSE, + url=URL, + ext_modules=xx, + packages = findPackage('python'), + package_dir = {"" : "python"}, + scripts = ['python/obi.py'] +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..7c6ccc8 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,61 @@ +cmake_minimum_required(VERSION 3.12) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +project (cobitools3) +set(CMAKE_BUILD_TYPE Release) + +SET(CMAKE_C_COMPILER gcc) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +file(GLOB_RECURSE CSRC "*.c") + +add_library(cobitools3 SHARED obierrno.c + obidms_taxonomy.c + obiblob_indexer.c + obi_lcs.c + obidmscolumn_str.c + bloom.c + build_reference_db.c + obidmscolumn_array.c + obidmscolumn_idx.c + obidmscolumn_bool.c + libjson/json_utils.c + libjson/cJSON.c + obidmscolumn_blob.c + dna_seq_indexer.c + obi_ecotag.c + encode.c + obiavl.c + sse_banded_LCS_alignment.c + kmer_similarity.c + obidmscolumn_qual.c + obi_clean.c + utils.c + uint8_indexer.c + murmurhash2.c + obidmscolumn_char.c + obiview.c + obidmscolumn_int.c + linked_list.c + obiblob.c + hashtable.c + obidmscolumn.c + char_str_indexer.c + obidmscolumn_float.c + upperband.c + crc64.c + obidmscolumn_seq.c + obilittlebigman.c + obidmscolumndir.c + obidms.c + obi_ecopcr.c + libecoPCR/libthermo/nnparams.c + libecoPCR/ecoapat.c + libecoPCR/libapat/libstki.c + libecoPCR/libapat/apat_search.c + libecoPCR/libapat/apat_parse.c + libecoPCR/ecodna.c + libecoPCR/ecoMalloc.c + libecoPCR/ecoError.c + obitypes.c + array_indexer.c) \ No newline at end of file From 5a05258fcb0749306dffa046546a8cc3358d2fd0 Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Tue, 26 Mar 2019 15:52:59 +0100 Subject: [PATCH 02/14] fixed relative cython imports to be absolute --- .../dms/column/typed_column/qual.pxd | 4 +-- .../dms/column/typed_column/qual.pyx | 17 +++++---- .../obitools3/dms/column/typed_column/seq.pxd | 4 +-- .../obitools3/dms/column/typed_column/seq.pyx | 17 +++++---- .../obitools3/dms/column/typed_column/str.pxd | 4 +-- .../obitools3/dms/column/typed_column/str.pyx | 36 ++++++++++--------- 6 files changed, 47 insertions(+), 35 deletions(-) diff --git a/python/obitools3/dms/column/typed_column/qual.pxd b/python/obitools3/dms/column/typed_column/qual.pxd index 3b8a20e..c5ecdbe 100755 --- a/python/obitools3/dms/column/typed_column/qual.pxd +++ b/python/obitools3/dms/column/typed_column/qual.pxd @@ -1,9 +1,9 @@ # #cython: language_level=3 -from ...capi.obitypes cimport index_t +from obitools3.dms.capi.obitypes cimport index_t -from ..column_idx cimport Column_idx, \ +from obitools3.dms.column_idx cimport Column_idx, \ Column_multi_elts_idx diff --git a/python/obitools3/dms/column/typed_column/qual.pyx b/python/obitools3/dms/column/typed_column/qual.pyx index 7670f3a..bae55d1 100755 --- a/python/obitools3/dms/column/typed_column/qual.pyx +++ b/python/obitools3/dms/column/typed_column/qual.pyx @@ -1,17 +1,22 @@ #cython: language_level=3 +from obitools3.dms.capi.obitypes cimport index_t + +from obitools3.dms.column_idx cimport Column_idx, \ + Column_multi_elts_idx + from obitools3.dms.capi.obierrno cimport obi_errno -from ..column cimport register_column_class +from obitools3.dms.column cimport register_column_class -from ...view.view cimport View +from obitools3.dms.view.view cimport View -from ..column cimport Column +from obitools3.dms.column cimport Column from obitools3.utils cimport tobytes, bytes2str, \ obi_errno_to_exception -from ...capi.obiview cimport obi_get_qual_char_with_elt_name_and_col_p_in_view, \ +from obitools3.dms.capi.obiview cimport obi_get_qual_char_with_elt_name_and_col_p_in_view, \ obi_get_qual_char_with_elt_idx_and_col_p_in_view, \ obi_set_qual_char_with_elt_name_and_col_p_in_view, \ obi_set_qual_char_with_elt_idx_and_col_p_in_view, \ @@ -21,9 +26,9 @@ from ...capi.obiview cimport obi_get_qual_char_with_elt_name_and_col_p_in_view, obi_set_qual_int_with_elt_idx_and_col_p_in_view, \ Obiview_p -from ...capi.obidmscolumn cimport OBIDMS_column_p +from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p -from ...capi.obitypes cimport OBI_QUAL, OBIQual_char_NA, OBIQual_int_NA, const_char_p +from obitools3.dms.capi.obitypes cimport OBI_QUAL, OBIQual_char_NA, OBIQual_int_NA, const_char_p from libc.stdlib cimport malloc, free from libc.stdint cimport uint8_t diff --git a/python/obitools3/dms/column/typed_column/seq.pxd b/python/obitools3/dms/column/typed_column/seq.pxd index fcab9af..465ed92 100755 --- a/python/obitools3/dms/column/typed_column/seq.pxd +++ b/python/obitools3/dms/column/typed_column/seq.pxd @@ -1,9 +1,9 @@ # #cython: language_level=3 -from ...capi.obitypes cimport index_t +from obitools3.dms.capi.obitypes cimport index_t -from ..column_idx cimport Column_idx, \ +from obitools3.dms.column_idx cimport Column_idx, \ Column_multi_elts_idx diff --git a/python/obitools3/dms/column/typed_column/seq.pyx b/python/obitools3/dms/column/typed_column/seq.pyx index e77e076..a198765 100755 --- a/python/obitools3/dms/column/typed_column/seq.pyx +++ b/python/obitools3/dms/column/typed_column/seq.pyx @@ -1,17 +1,20 @@ #cython: language_level=3 +from obitools3.dms.capi.obitypes cimport index_t + +from obitools3.dms.column_idx cimport Column_idx, \ + Column_multi_elts_idx + from obitools3.dms.capi.obierrno cimport obi_errno -from ..column cimport register_column_class +from obitools3.dms.column.column cimport Column, register_column_class -from ...view.view cimport View - -from ..column cimport Column +from obitools3.dms.view.view cimport View from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from ...capi.obiview cimport obi_get_seq_with_elt_name_and_col_p_in_view, \ +from obitools3.dms.capi.obiview cimport obi_get_seq_with_elt_name_and_col_p_in_view, \ obi_get_seq_with_elt_idx_and_col_p_in_view, \ obi_set_seq_with_elt_name_and_col_p_in_view, \ obi_set_seq_with_elt_idx_and_col_p_in_view, \ @@ -21,9 +24,9 @@ from ...capi.obiview cimport obi_get_seq_with_elt_name_and_col_p_in_view, \ obi_set_array_with_col_p_in_view, \ Obiview_p -from ...capi.obidmscolumn cimport OBIDMS_column_p +from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p -from ...capi.obitypes cimport OBI_SEQ, \ +from obitools3.dms.capi.obitypes cimport OBI_SEQ, \ OBISeq_NA, \ OBITuple_NA diff --git a/python/obitools3/dms/column/typed_column/str.pxd b/python/obitools3/dms/column/typed_column/str.pxd index 8f72b44..a17d23c 100755 --- a/python/obitools3/dms/column/typed_column/str.pxd +++ b/python/obitools3/dms/column/typed_column/str.pxd @@ -1,9 +1,9 @@ # #cython: language_level=3 -from ...capi.obitypes cimport index_t +from obitools3.dms.capi.obitypes cimport index_t -from ..column_idx cimport Column_idx, \ +from obitools3.dms.column_idx cimport Column_idx, \ Column_multi_elts_idx diff --git a/python/obitools3/dms/column/typed_column/str.pyx b/python/obitools3/dms/column/typed_column/str.pyx index 412d86b..e2fe59c 100755 --- a/python/obitools3/dms/column/typed_column/str.pyx +++ b/python/obitools3/dms/column/typed_column/str.pyx @@ -1,30 +1,34 @@ #cython: language_level=3 +from obitools3.dms.capi.obitypes cimport index_t + +from obitools3.dms.column_idx cimport Column_idx, \ + Column_multi_elts_idx + + from obitools3.dms.capi.obierrno cimport obi_errno -from ..column cimport register_column_class +from obitools3.dms.column.column cimport Column, register_column_class -from ...view.view cimport View - -from ..column cimport Column +from obitools3.dms.view.view cimport View from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from ...capi.obiview cimport obi_get_str_with_elt_name_and_col_p_in_view, \ - obi_get_str_with_elt_idx_and_col_p_in_view, \ - obi_set_str_with_elt_name_and_col_p_in_view, \ - obi_set_str_with_elt_idx_and_col_p_in_view, \ - obi_get_array_with_col_p_in_view, \ - obi_set_array_with_col_p_in_view, \ - Obiview_p +from obitools3.dms.capi.obiview cimport obi_get_str_with_elt_name_and_col_p_in_view, \ + obi_get_str_with_elt_idx_and_col_p_in_view, \ + obi_set_str_with_elt_name_and_col_p_in_view, \ + obi_set_str_with_elt_idx_and_col_p_in_view, \ + obi_get_array_with_col_p_in_view, \ + obi_set_array_with_col_p_in_view, \ + Obiview_p -from ...capi.obidmscolumn cimport OBIDMS_column_p +from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p -from ...capi.obitypes cimport OBI_STR, \ - OBIStr_NA, \ - OBITuple_NA, \ - const_char_p +from obitools3.dms.capi.obitypes cimport OBI_STR, \ + OBIStr_NA, \ + OBITuple_NA, \ + const_char_p from libc.stdint cimport int32_t from libc.stdlib cimport calloc, free From 1095a617a3bd15b0a000dfb99cb8ba1dcfeba947 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Tue, 26 Mar 2019 15:54:33 +0100 Subject: [PATCH 03/14] Patch relative import to absolute --- .../dms/column/typed_column/bool.pxd | 4 +- .../dms/column/typed_column/bool.pyx | 16 ++- .../dms/column/typed_column/char.pxd | 4 +- .../dms/column/typed_column/char.pyx | 17 ++- .../dms/column/typed_column/float.pxd | 4 +- .../dms/column/typed_column/float.pyx | 15 ++- .../dms/column/typed_column/int.cfiles | 110 ------------------ .../obitools3/dms/column/typed_column/int.pxd | 4 +- .../obitools3/dms/column/typed_column/int.pyx | 14 ++- .../dms/column/typed_column/qual.cfiles | 110 ------------------ .../dms/column/typed_column/seq.cfiles | 110 ------------------ .../dms/column/typed_column/str.cfiles | 110 ------------------ 12 files changed, 49 insertions(+), 469 deletions(-) delete mode 100644 python/obitools3/dms/column/typed_column/int.cfiles delete mode 100644 python/obitools3/dms/column/typed_column/qual.cfiles delete mode 100644 python/obitools3/dms/column/typed_column/seq.cfiles delete mode 100644 python/obitools3/dms/column/typed_column/str.cfiles diff --git a/python/obitools3/dms/column/typed_column/bool.pxd b/python/obitools3/dms/column/typed_column/bool.pxd index 41209c0..22cf51b 100755 --- a/python/obitools3/dms/column/typed_column/bool.pxd +++ b/python/obitools3/dms/column/typed_column/bool.pxd @@ -1,9 +1,9 @@ # #cython: language_level=3 -from ...capi.obitypes cimport index_t +from obitools3.dms.capi.obitypes cimport index_t -from ..column cimport Column, \ +from obitools3.dms.column.column cimport Column, \ Column_multi_elts diff --git a/python/obitools3/dms/column/typed_column/bool.pyx b/python/obitools3/dms/column/typed_column/bool.pyx index 54377fd..ae113b8 100755 --- a/python/obitools3/dms/column/typed_column/bool.pyx +++ b/python/obitools3/dms/column/typed_column/bool.pyx @@ -2,14 +2,20 @@ from obitools3.dms.capi.obierrno cimport obi_errno -from ..column cimport register_column_class +from obitools3.dms.column.column cimport Column, \ + Column_multi_elts -from ...view.view cimport View +from obitools3.dms.capi.obitypes cimport index_t + + +from obitools3.dms.column.column cimport register_column_class + +from obitools3.dms.view.view cimport View from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from ...capi.obiview cimport obi_get_bool_with_elt_name_and_col_p_in_view, \ +from obitools3.dms.capi.obiview cimport obi_get_bool_with_elt_name_and_col_p_in_view, \ obi_get_bool_with_elt_idx_and_col_p_in_view, \ obi_set_bool_with_elt_name_and_col_p_in_view, \ obi_set_bool_with_elt_idx_and_col_p_in_view, \ @@ -17,9 +23,9 @@ from ...capi.obiview cimport obi_get_bool_with_elt_name_and_col_p_in_view, \ obi_set_array_with_col_p_in_view, \ Obiview_p -from ...capi.obidmscolumn cimport OBIDMS_column_p +from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p -from ...capi.obitypes cimport OBI_BOOL, \ +from obitools3.dms.capi.obitypes cimport OBI_BOOL, \ OBIBool_NA, \ OBITuple_NA, \ obibool_t diff --git a/python/obitools3/dms/column/typed_column/char.pxd b/python/obitools3/dms/column/typed_column/char.pxd index c67db85..7614c4f 100755 --- a/python/obitools3/dms/column/typed_column/char.pxd +++ b/python/obitools3/dms/column/typed_column/char.pxd @@ -1,9 +1,9 @@ # #cython: language_level=3 -from ...capi.obitypes cimport index_t +from obitools3.dms.capi.obitypes cimport index_t -from ..column cimport Column, \ +from obitools3.dms.column.column cimport Column, \ Column_multi_elts diff --git a/python/obitools3/dms/column/typed_column/char.pyx b/python/obitools3/dms/column/typed_column/char.pyx index 1ba7e89..d4e8c39 100755 --- a/python/obitools3/dms/column/typed_column/char.pyx +++ b/python/obitools3/dms/column/typed_column/char.pyx @@ -1,15 +1,20 @@ #cython: language_level=3 from obitools3.dms.capi.obierrno cimport obi_errno +from obitools3.dms.capi.obitypes cimport index_t -from ..column cimport register_column_class +from obitools3.dms.column.column cimport Column, \ + Column_multi_elts -from ...view.view cimport View + +from obitools3.dms.column.column cimport register_column_class + +from obitools3.dms.view.view cimport View from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from ...capi.obiview cimport obi_get_char_with_elt_name_and_col_p_in_view, \ +from obitools3.dms.capi.obiview cimport obi_get_char_with_elt_name_and_col_p_in_view, \ obi_get_char_with_elt_idx_and_col_p_in_view, \ obi_set_char_with_elt_name_and_col_p_in_view, \ obi_set_char_with_elt_idx_and_col_p_in_view, \ @@ -17,9 +22,9 @@ from ...capi.obiview cimport obi_get_char_with_elt_name_and_col_p_in_view, \ obi_set_array_with_col_p_in_view, \ Obiview_p -from ...capi.obidmscolumn cimport OBIDMS_column_p +from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p -from ...capi.obitypes cimport OBI_CHAR, \ +from obitools3.dms.capi.obitypes cimport OBI_CHAR, \ OBIChar_NA, \ OBITuple_NA, \ obichar_t @@ -116,7 +121,7 @@ cdef class Column_multi_elts_char(Column_multi_elts): cpdef set_item(self, index_t line_nb, object elt_id, object value) : global obi_errno - cdef bytes elt_name + cdef bytes elt_name cdef obichar_t value_b if value is None : value_b = OBIChar_NA diff --git a/python/obitools3/dms/column/typed_column/float.pxd b/python/obitools3/dms/column/typed_column/float.pxd index 07e9f7b..edd898e 100755 --- a/python/obitools3/dms/column/typed_column/float.pxd +++ b/python/obitools3/dms/column/typed_column/float.pxd @@ -1,9 +1,9 @@ # #cython: language_level=3 -from ...capi.obitypes cimport index_t +from obitools3.dms.capi.obitypes cimport index_t -from ..column cimport Column, \ +from obitools3.dms.column.column cimport Column, \ Column_multi_elts diff --git a/python/obitools3/dms/column/typed_column/float.pyx b/python/obitools3/dms/column/typed_column/float.pyx index 3a0702b..f00e123 100755 --- a/python/obitools3/dms/column/typed_column/float.pyx +++ b/python/obitools3/dms/column/typed_column/float.pyx @@ -1,15 +1,20 @@ #cython: language_level=3 from obitools3.dms.capi.obierrno cimport obi_errno +from obitools3.dms.capi.obitypes cimport index_t -from ..column cimport register_column_class +from obitools3.dms.column.column cimport Column, \ + Column_multi_elts -from ...view.view cimport View + +from obitools3.dms.column.column cimport register_column_class + +from obitools3.dms.view.view cimport View from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from ...capi.obiview cimport obi_get_float_with_elt_name_and_col_p_in_view, \ +from obitools3.dms.capi.obiview cimport obi_get_float_with_elt_name_and_col_p_in_view, \ obi_get_float_with_elt_idx_and_col_p_in_view, \ obi_set_float_with_elt_name_and_col_p_in_view, \ obi_set_float_with_elt_idx_and_col_p_in_view, \ @@ -17,9 +22,9 @@ from ...capi.obiview cimport obi_get_float_with_elt_name_and_col_p_in_view, \ obi_set_array_with_col_p_in_view, \ Obiview_p -from ...capi.obidmscolumn cimport OBIDMS_column_p +from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p -from ...capi.obitypes cimport OBI_FLOAT, \ +from obitools3.dms.capi.obitypes cimport OBI_FLOAT, \ OBIFloat_NA, \ OBITuple_NA, \ obifloat_t diff --git a/python/obitools3/dms/column/typed_column/int.cfiles b/python/obitools3/dms/column/typed_column/int.cfiles deleted file mode 100644 index 72668a9..0000000 --- a/python/obitools3/dms/column/typed_column/int.cfiles +++ /dev/null @@ -1,110 +0,0 @@ -../../../../../src/obi_lcs.h -../../../../../src/obi_lcs.c -../../../../../src/obierrno.h -../../../../../src/obierrno.c -../../../../../src/upperband.h -../../../../../src/upperband.c -../../../../../src/sse_banded_LCS_alignment.h -../../../../../src/sse_banded_LCS_alignment.c -../../../../../src/obiblob.h -../../../../../src/obiblob.c -../../../../../src/utils.h -../../../../../src/utils.c -../../../../../src/obidms.h -../../../../../src/obidms.c -../../../../../src/libjson/json_utils.h -../../../../../src/libjson/json_utils.c -../../../../../src/libjson/cJSON.h -../../../../../src/libjson/cJSON.c -../../../../../src/obiavl.h -../../../../../src/obiavl.c -../../../../../src/bloom.h -../../../../../src/bloom.c -../../../../../src/crc64.h -../../../../../src/crc64.c -../../../../../src/murmurhash2.h -../../../../../src/murmurhash2.c -../../../../../src/obidmscolumn.h -../../../../../src/obidmscolumn.c -../../../../../src/obitypes.h -../../../../../src/obitypes.c -../../../../../src/obidmscolumndir.h -../../../../../src/obidmscolumndir.c -../../../../../src/obiblob_indexer.h -../../../../../src/obiblob_indexer.c -../../../../../src/obiview.h -../../../../../src/obiview.c -../../../../../src/hashtable.h -../../../../../src/hashtable.c -../../../../../src/linked_list.h -../../../../../src/linked_list.c -../../../../../src/obidmscolumn_array.h -../../../../../src/obidmscolumn_array.c -../../../../../src/obidmscolumn_blob.h -../../../../../src/obidmscolumn_blob.c -../../../../../src/obidmscolumn_idx.h -../../../../../src/obidmscolumn_idx.c -../../../../../src/obidmscolumn_bool.h -../../../../../src/obidmscolumn_bool.c -../../../../../src/obidmscolumn_char.h -../../../../../src/obidmscolumn_char.c -../../../../../src/obidmscolumn_float.h -../../../../../src/obidmscolumn_float.c -../../../../../src/obidmscolumn_int.h -../../../../../src/obidmscolumn_int.c -../../../../../src/obidmscolumn_qual.h -../../../../../src/obidmscolumn_qual.c -../../../../../src/obidmscolumn_seq.h -../../../../../src/obidmscolumn_seq.c -../../../../../src/obidmscolumn_str.h -../../../../../src/obidmscolumn_str.c -../../../../../src/array_indexer.h -../../../../../src/array_indexer.c -../../../../../src/char_str_indexer.h -../../../../../src/char_str_indexer.c -../../../../../src/dna_seq_indexer.h -../../../../../src/dna_seq_indexer.c -../../../../../src/encode.c -../../../../../src/encode.h -../../../../../src/uint8_indexer.c -../../../../../src/uint8_indexer.h -../../../../../src/build_reference_db.c -../../../../../src/build_reference_db.h -../../../../../src/kmer_similarity.c -../../../../../src/kmer_similarity.h -../../../../../src/obi_clean.c -../../../../../src/obi_clean.h -../../../../../src/obi_ecopcr.c -../../../../../src/obi_ecopcr.h -../../../../../src/obi_ecotag.c -../../../../../src/obi_ecotag.h -../../../../../src/obidms_taxonomy.c -../../../../../src/obidms_taxonomy.h -../../../../../src/obilittlebigman.c -../../../../../src/obilittlebigman.h -../../../../../src/_sse.h -../../../../../src/obidebug.h -../../../../../src/libecoPCR/libapat/CODES/dft_code.h -../../../../../src/libecoPCR/libapat/CODES/dna_code.h -../../../../../src/libecoPCR/libapat/CODES/prot_code.h -../../../../../src/libecoPCR/libapat/apat_parse.c -../../../../../src/libecoPCR/libapat/apat_search.c -../../../../../src/libecoPCR/libapat/apat.h -../../../../../src/libecoPCR/libapat/Gmach.h -../../../../../src/libecoPCR/libapat/Gtypes.h -../../../../../src/libecoPCR/libapat/libstki.c -../../../../../src/libecoPCR/libapat/libstki.h -../../../../../src/libecoPCR/libthermo/nnparams.h -../../../../../src/libecoPCR/libthermo/nnparams.c -../../../../../src/libecoPCR/ecoapat.c -../../../../../src/libecoPCR/ecodna.c -../../../../../src/libecoPCR/ecoError.c -../../../../../src/libecoPCR/ecoMalloc.c -../../../../../src/libecoPCR/ecoPCR.h - - - - - - - diff --git a/python/obitools3/dms/column/typed_column/int.pxd b/python/obitools3/dms/column/typed_column/int.pxd index 0cac022..51be9f3 100755 --- a/python/obitools3/dms/column/typed_column/int.pxd +++ b/python/obitools3/dms/column/typed_column/int.pxd @@ -1,9 +1,9 @@ # #cython: language_level=3 -from ...capi.obitypes cimport index_t +from obitools3.dms.capi.obitypes cimport index_t -from ..column cimport Column, \ +from obitools3.dms.column.column cimport Column, \ Column_multi_elts diff --git a/python/obitools3/dms/column/typed_column/int.pyx b/python/obitools3/dms/column/typed_column/int.pyx index 5d9150e..2359d0a 100755 --- a/python/obitools3/dms/column/typed_column/int.pyx +++ b/python/obitools3/dms/column/typed_column/int.pyx @@ -1,15 +1,19 @@ #cython: language_level=3 from obitools3.dms.capi.obierrno cimport obi_errno +from obitools3.dms.capi.obitypes cimport index_t -from ..column cimport register_column_class +from obitools3.dms.column.column cimport Column, \ + Column_multi_elts -from ...view.view cimport View +from obitools3.dms.column.column cimport register_column_class + +from obitools3.dms.view.view cimport View from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from ...capi.obiview cimport obi_get_int_with_elt_name_and_col_p_in_view, \ +from obitools3.dms.capi.obiview cimport obi_get_int_with_elt_name_and_col_p_in_view, \ obi_get_int_with_elt_idx_and_col_p_in_view, \ obi_set_int_with_elt_name_and_col_p_in_view, \ obi_set_int_with_elt_idx_and_col_p_in_view, \ @@ -17,9 +21,9 @@ from ...capi.obiview cimport obi_get_int_with_elt_name_and_col_p_in_view, \ obi_set_array_with_col_p_in_view, \ Obiview_p -from ...capi.obidmscolumn cimport OBIDMS_column_p +from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p -from ...capi.obitypes cimport OBI_INT, \ +from obitools3.dms.capi.obitypes cimport OBI_INT, \ OBIInt_NA, \ OBITuple_NA, \ obiint_t diff --git a/python/obitools3/dms/column/typed_column/qual.cfiles b/python/obitools3/dms/column/typed_column/qual.cfiles deleted file mode 100644 index 72668a9..0000000 --- a/python/obitools3/dms/column/typed_column/qual.cfiles +++ /dev/null @@ -1,110 +0,0 @@ -../../../../../src/obi_lcs.h -../../../../../src/obi_lcs.c -../../../../../src/obierrno.h -../../../../../src/obierrno.c -../../../../../src/upperband.h -../../../../../src/upperband.c -../../../../../src/sse_banded_LCS_alignment.h -../../../../../src/sse_banded_LCS_alignment.c -../../../../../src/obiblob.h -../../../../../src/obiblob.c -../../../../../src/utils.h -../../../../../src/utils.c -../../../../../src/obidms.h -../../../../../src/obidms.c -../../../../../src/libjson/json_utils.h -../../../../../src/libjson/json_utils.c -../../../../../src/libjson/cJSON.h -../../../../../src/libjson/cJSON.c -../../../../../src/obiavl.h -../../../../../src/obiavl.c -../../../../../src/bloom.h -../../../../../src/bloom.c -../../../../../src/crc64.h -../../../../../src/crc64.c -../../../../../src/murmurhash2.h -../../../../../src/murmurhash2.c -../../../../../src/obidmscolumn.h -../../../../../src/obidmscolumn.c -../../../../../src/obitypes.h -../../../../../src/obitypes.c -../../../../../src/obidmscolumndir.h -../../../../../src/obidmscolumndir.c -../../../../../src/obiblob_indexer.h -../../../../../src/obiblob_indexer.c -../../../../../src/obiview.h -../../../../../src/obiview.c -../../../../../src/hashtable.h -../../../../../src/hashtable.c -../../../../../src/linked_list.h -../../../../../src/linked_list.c -../../../../../src/obidmscolumn_array.h -../../../../../src/obidmscolumn_array.c -../../../../../src/obidmscolumn_blob.h -../../../../../src/obidmscolumn_blob.c -../../../../../src/obidmscolumn_idx.h -../../../../../src/obidmscolumn_idx.c -../../../../../src/obidmscolumn_bool.h -../../../../../src/obidmscolumn_bool.c -../../../../../src/obidmscolumn_char.h -../../../../../src/obidmscolumn_char.c -../../../../../src/obidmscolumn_float.h -../../../../../src/obidmscolumn_float.c -../../../../../src/obidmscolumn_int.h -../../../../../src/obidmscolumn_int.c -../../../../../src/obidmscolumn_qual.h -../../../../../src/obidmscolumn_qual.c -../../../../../src/obidmscolumn_seq.h -../../../../../src/obidmscolumn_seq.c -../../../../../src/obidmscolumn_str.h -../../../../../src/obidmscolumn_str.c -../../../../../src/array_indexer.h -../../../../../src/array_indexer.c -../../../../../src/char_str_indexer.h -../../../../../src/char_str_indexer.c -../../../../../src/dna_seq_indexer.h -../../../../../src/dna_seq_indexer.c -../../../../../src/encode.c -../../../../../src/encode.h -../../../../../src/uint8_indexer.c -../../../../../src/uint8_indexer.h -../../../../../src/build_reference_db.c -../../../../../src/build_reference_db.h -../../../../../src/kmer_similarity.c -../../../../../src/kmer_similarity.h -../../../../../src/obi_clean.c -../../../../../src/obi_clean.h -../../../../../src/obi_ecopcr.c -../../../../../src/obi_ecopcr.h -../../../../../src/obi_ecotag.c -../../../../../src/obi_ecotag.h -../../../../../src/obidms_taxonomy.c -../../../../../src/obidms_taxonomy.h -../../../../../src/obilittlebigman.c -../../../../../src/obilittlebigman.h -../../../../../src/_sse.h -../../../../../src/obidebug.h -../../../../../src/libecoPCR/libapat/CODES/dft_code.h -../../../../../src/libecoPCR/libapat/CODES/dna_code.h -../../../../../src/libecoPCR/libapat/CODES/prot_code.h -../../../../../src/libecoPCR/libapat/apat_parse.c -../../../../../src/libecoPCR/libapat/apat_search.c -../../../../../src/libecoPCR/libapat/apat.h -../../../../../src/libecoPCR/libapat/Gmach.h -../../../../../src/libecoPCR/libapat/Gtypes.h -../../../../../src/libecoPCR/libapat/libstki.c -../../../../../src/libecoPCR/libapat/libstki.h -../../../../../src/libecoPCR/libthermo/nnparams.h -../../../../../src/libecoPCR/libthermo/nnparams.c -../../../../../src/libecoPCR/ecoapat.c -../../../../../src/libecoPCR/ecodna.c -../../../../../src/libecoPCR/ecoError.c -../../../../../src/libecoPCR/ecoMalloc.c -../../../../../src/libecoPCR/ecoPCR.h - - - - - - - diff --git a/python/obitools3/dms/column/typed_column/seq.cfiles b/python/obitools3/dms/column/typed_column/seq.cfiles deleted file mode 100644 index 72668a9..0000000 --- a/python/obitools3/dms/column/typed_column/seq.cfiles +++ /dev/null @@ -1,110 +0,0 @@ -../../../../../src/obi_lcs.h -../../../../../src/obi_lcs.c -../../../../../src/obierrno.h -../../../../../src/obierrno.c -../../../../../src/upperband.h -../../../../../src/upperband.c -../../../../../src/sse_banded_LCS_alignment.h -../../../../../src/sse_banded_LCS_alignment.c -../../../../../src/obiblob.h -../../../../../src/obiblob.c -../../../../../src/utils.h -../../../../../src/utils.c -../../../../../src/obidms.h -../../../../../src/obidms.c -../../../../../src/libjson/json_utils.h -../../../../../src/libjson/json_utils.c -../../../../../src/libjson/cJSON.h -../../../../../src/libjson/cJSON.c -../../../../../src/obiavl.h -../../../../../src/obiavl.c -../../../../../src/bloom.h -../../../../../src/bloom.c -../../../../../src/crc64.h -../../../../../src/crc64.c -../../../../../src/murmurhash2.h -../../../../../src/murmurhash2.c -../../../../../src/obidmscolumn.h -../../../../../src/obidmscolumn.c -../../../../../src/obitypes.h -../../../../../src/obitypes.c -../../../../../src/obidmscolumndir.h -../../../../../src/obidmscolumndir.c -../../../../../src/obiblob_indexer.h -../../../../../src/obiblob_indexer.c -../../../../../src/obiview.h -../../../../../src/obiview.c -../../../../../src/hashtable.h -../../../../../src/hashtable.c -../../../../../src/linked_list.h -../../../../../src/linked_list.c -../../../../../src/obidmscolumn_array.h -../../../../../src/obidmscolumn_array.c -../../../../../src/obidmscolumn_blob.h -../../../../../src/obidmscolumn_blob.c -../../../../../src/obidmscolumn_idx.h -../../../../../src/obidmscolumn_idx.c -../../../../../src/obidmscolumn_bool.h -../../../../../src/obidmscolumn_bool.c -../../../../../src/obidmscolumn_char.h -../../../../../src/obidmscolumn_char.c -../../../../../src/obidmscolumn_float.h -../../../../../src/obidmscolumn_float.c -../../../../../src/obidmscolumn_int.h -../../../../../src/obidmscolumn_int.c -../../../../../src/obidmscolumn_qual.h -../../../../../src/obidmscolumn_qual.c -../../../../../src/obidmscolumn_seq.h -../../../../../src/obidmscolumn_seq.c -../../../../../src/obidmscolumn_str.h -../../../../../src/obidmscolumn_str.c -../../../../../src/array_indexer.h -../../../../../src/array_indexer.c -../../../../../src/char_str_indexer.h -../../../../../src/char_str_indexer.c -../../../../../src/dna_seq_indexer.h -../../../../../src/dna_seq_indexer.c -../../../../../src/encode.c -../../../../../src/encode.h -../../../../../src/uint8_indexer.c -../../../../../src/uint8_indexer.h -../../../../../src/build_reference_db.c -../../../../../src/build_reference_db.h -../../../../../src/kmer_similarity.c -../../../../../src/kmer_similarity.h -../../../../../src/obi_clean.c -../../../../../src/obi_clean.h -../../../../../src/obi_ecopcr.c -../../../../../src/obi_ecopcr.h -../../../../../src/obi_ecotag.c -../../../../../src/obi_ecotag.h -../../../../../src/obidms_taxonomy.c -../../../../../src/obidms_taxonomy.h -../../../../../src/obilittlebigman.c -../../../../../src/obilittlebigman.h -../../../../../src/_sse.h -../../../../../src/obidebug.h -../../../../../src/libecoPCR/libapat/CODES/dft_code.h -../../../../../src/libecoPCR/libapat/CODES/dna_code.h -../../../../../src/libecoPCR/libapat/CODES/prot_code.h -../../../../../src/libecoPCR/libapat/apat_parse.c -../../../../../src/libecoPCR/libapat/apat_search.c -../../../../../src/libecoPCR/libapat/apat.h -../../../../../src/libecoPCR/libapat/Gmach.h -../../../../../src/libecoPCR/libapat/Gtypes.h -../../../../../src/libecoPCR/libapat/libstki.c -../../../../../src/libecoPCR/libapat/libstki.h -../../../../../src/libecoPCR/libthermo/nnparams.h -../../../../../src/libecoPCR/libthermo/nnparams.c -../../../../../src/libecoPCR/ecoapat.c -../../../../../src/libecoPCR/ecodna.c -../../../../../src/libecoPCR/ecoError.c -../../../../../src/libecoPCR/ecoMalloc.c -../../../../../src/libecoPCR/ecoPCR.h - - - - - - - diff --git a/python/obitools3/dms/column/typed_column/str.cfiles b/python/obitools3/dms/column/typed_column/str.cfiles deleted file mode 100644 index 72668a9..0000000 --- a/python/obitools3/dms/column/typed_column/str.cfiles +++ /dev/null @@ -1,110 +0,0 @@ -../../../../../src/obi_lcs.h -../../../../../src/obi_lcs.c -../../../../../src/obierrno.h -../../../../../src/obierrno.c -../../../../../src/upperband.h -../../../../../src/upperband.c -../../../../../src/sse_banded_LCS_alignment.h -../../../../../src/sse_banded_LCS_alignment.c -../../../../../src/obiblob.h -../../../../../src/obiblob.c -../../../../../src/utils.h -../../../../../src/utils.c -../../../../../src/obidms.h -../../../../../src/obidms.c -../../../../../src/libjson/json_utils.h -../../../../../src/libjson/json_utils.c -../../../../../src/libjson/cJSON.h -../../../../../src/libjson/cJSON.c -../../../../../src/obiavl.h -../../../../../src/obiavl.c -../../../../../src/bloom.h -../../../../../src/bloom.c -../../../../../src/crc64.h -../../../../../src/crc64.c -../../../../../src/murmurhash2.h -../../../../../src/murmurhash2.c -../../../../../src/obidmscolumn.h -../../../../../src/obidmscolumn.c -../../../../../src/obitypes.h -../../../../../src/obitypes.c -../../../../../src/obidmscolumndir.h -../../../../../src/obidmscolumndir.c -../../../../../src/obiblob_indexer.h -../../../../../src/obiblob_indexer.c -../../../../../src/obiview.h -../../../../../src/obiview.c -../../../../../src/hashtable.h -../../../../../src/hashtable.c -../../../../../src/linked_list.h -../../../../../src/linked_list.c -../../../../../src/obidmscolumn_array.h -../../../../../src/obidmscolumn_array.c -../../../../../src/obidmscolumn_blob.h -../../../../../src/obidmscolumn_blob.c -../../../../../src/obidmscolumn_idx.h -../../../../../src/obidmscolumn_idx.c -../../../../../src/obidmscolumn_bool.h -../../../../../src/obidmscolumn_bool.c -../../../../../src/obidmscolumn_char.h -../../../../../src/obidmscolumn_char.c -../../../../../src/obidmscolumn_float.h -../../../../../src/obidmscolumn_float.c -../../../../../src/obidmscolumn_int.h -../../../../../src/obidmscolumn_int.c -../../../../../src/obidmscolumn_qual.h -../../../../../src/obidmscolumn_qual.c -../../../../../src/obidmscolumn_seq.h -../../../../../src/obidmscolumn_seq.c -../../../../../src/obidmscolumn_str.h -../../../../../src/obidmscolumn_str.c -../../../../../src/array_indexer.h -../../../../../src/array_indexer.c -../../../../../src/char_str_indexer.h -../../../../../src/char_str_indexer.c -../../../../../src/dna_seq_indexer.h -../../../../../src/dna_seq_indexer.c -../../../../../src/encode.c -../../../../../src/encode.h -../../../../../src/uint8_indexer.c -../../../../../src/uint8_indexer.h -../../../../../src/build_reference_db.c -../../../../../src/build_reference_db.h -../../../../../src/kmer_similarity.c -../../../../../src/kmer_similarity.h -../../../../../src/obi_clean.c -../../../../../src/obi_clean.h -../../../../../src/obi_ecopcr.c -../../../../../src/obi_ecopcr.h -../../../../../src/obi_ecotag.c -../../../../../src/obi_ecotag.h -../../../../../src/obidms_taxonomy.c -../../../../../src/obidms_taxonomy.h -../../../../../src/obilittlebigman.c -../../../../../src/obilittlebigman.h -../../../../../src/_sse.h -../../../../../src/obidebug.h -../../../../../src/libecoPCR/libapat/CODES/dft_code.h -../../../../../src/libecoPCR/libapat/CODES/dna_code.h -../../../../../src/libecoPCR/libapat/CODES/prot_code.h -../../../../../src/libecoPCR/libapat/apat_parse.c -../../../../../src/libecoPCR/libapat/apat_search.c -../../../../../src/libecoPCR/libapat/apat.h -../../../../../src/libecoPCR/libapat/Gmach.h -../../../../../src/libecoPCR/libapat/Gtypes.h -../../../../../src/libecoPCR/libapat/libstki.c -../../../../../src/libecoPCR/libapat/libstki.h -../../../../../src/libecoPCR/libthermo/nnparams.h -../../../../../src/libecoPCR/libthermo/nnparams.c -../../../../../src/libecoPCR/ecoapat.c -../../../../../src/libecoPCR/ecodna.c -../../../../../src/libecoPCR/ecoError.c -../../../../../src/libecoPCR/ecoMalloc.c -../../../../../src/libecoPCR/ecoPCR.h - - - - - - - From 0b4ea49539d2832877aa4f352530ce309cb8e971 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Tue, 26 Mar 2019 16:14:03 +0100 Subject: [PATCH 04/14] Convert relative import an delete cfiles --- python/obitools3/dms/column/column.cfiles | 110 ------------------ python/obitools3/dms/column/column_idx.cfiles | 110 ------------------ python/obitools3/dms/column/column_idx.pxd | 2 +- python/obitools3/dms/column/column_idx.pyx | 2 +- .../dms/column/typed_column/bool.cfiles | 110 ------------------ .../dms/column/typed_column/char.cfiles | 110 ------------------ .../dms/column/typed_column/float.cfiles | 110 ------------------ .../dms/column/typed_column/qual.pxd | 4 +- .../dms/column/typed_column/qual.pyx | 9 +- .../obitools3/dms/column/typed_column/seq.pxd | 2 +- .../obitools3/dms/column/typed_column/seq.pyx | 2 +- .../obitools3/dms/column/typed_column/str.pxd | 2 +- .../obitools3/dms/column/typed_column/str.pyx | 2 +- python/obitools3/dms/dms.pxd | 4 +- 14 files changed, 14 insertions(+), 565 deletions(-) delete mode 100644 python/obitools3/dms/column/column.cfiles delete mode 100644 python/obitools3/dms/column/column_idx.cfiles delete mode 100644 python/obitools3/dms/column/typed_column/bool.cfiles delete mode 100644 python/obitools3/dms/column/typed_column/char.cfiles delete mode 100644 python/obitools3/dms/column/typed_column/float.cfiles diff --git a/python/obitools3/dms/column/column.cfiles b/python/obitools3/dms/column/column.cfiles deleted file mode 100644 index 19f702c..0000000 --- a/python/obitools3/dms/column/column.cfiles +++ /dev/null @@ -1,110 +0,0 @@ -../../../../src/obi_lcs.h -../../../../src/obi_lcs.c -../../../../src/obierrno.h -../../../../src/obierrno.c -../../../../src/upperband.h -../../../../src/upperband.c -../../../../src/sse_banded_LCS_alignment.h -../../../../src/sse_banded_LCS_alignment.c -../../../../src/obiblob.h -../../../../src/obiblob.c -../../../../src/utils.h -../../../../src/utils.c -../../../../src/obidms.h -../../../../src/obidms.c -../../../../src/libjson/json_utils.h -../../../../src/libjson/json_utils.c -../../../../src/libjson/cJSON.h -../../../../src/libjson/cJSON.c -../../../../src/obiavl.h -../../../../src/obiavl.c -../../../../src/bloom.h -../../../../src/bloom.c -../../../../src/crc64.h -../../../../src/crc64.c -../../../../src/murmurhash2.h -../../../../src/murmurhash2.c -../../../../src/obidmscolumn.h -../../../../src/obidmscolumn.c -../../../../src/obitypes.h -../../../../src/obitypes.c -../../../../src/obidmscolumndir.h -../../../../src/obidmscolumndir.c -../../../../src/obiblob_indexer.h -../../../../src/obiblob_indexer.c -../../../../src/obiview.h -../../../../src/obiview.c -../../../../src/hashtable.h -../../../../src/hashtable.c -../../../../src/linked_list.h -../../../../src/linked_list.c -../../../../src/obidmscolumn_array.h -../../../../src/obidmscolumn_array.c -../../../../src/obidmscolumn_blob.h -../../../../src/obidmscolumn_blob.c -../../../../src/obidmscolumn_idx.h -../../../../src/obidmscolumn_idx.c -../../../../src/obidmscolumn_bool.h -../../../../src/obidmscolumn_bool.c -../../../../src/obidmscolumn_char.h -../../../../src/obidmscolumn_char.c -../../../../src/obidmscolumn_float.h -../../../../src/obidmscolumn_float.c -../../../../src/obidmscolumn_int.h -../../../../src/obidmscolumn_int.c -../../../../src/obidmscolumn_qual.h -../../../../src/obidmscolumn_qual.c -../../../../src/obidmscolumn_seq.h -../../../../src/obidmscolumn_seq.c -../../../../src/obidmscolumn_str.h -../../../../src/obidmscolumn_str.c -../../../../src/array_indexer.h -../../../../src/array_indexer.c -../../../../src/char_str_indexer.h -../../../../src/char_str_indexer.c -../../../../src/dna_seq_indexer.h -../../../../src/dna_seq_indexer.c -../../../../src/encode.c -../../../../src/encode.h -../../../../src/uint8_indexer.c -../../../../src/uint8_indexer.h -../../../../src/build_reference_db.c -../../../../src/build_reference_db.h -../../../../src/kmer_similarity.c -../../../../src/kmer_similarity.h -../../../../src/obi_clean.c -../../../../src/obi_clean.h -../../../../src/obi_ecopcr.c -../../../../src/obi_ecopcr.h -../../../../src/obi_ecotag.c -../../../../src/obi_ecotag.h -../../../../src/obidms_taxonomy.c -../../../../src/obidms_taxonomy.h -../../../../src/obilittlebigman.c -../../../../src/obilittlebigman.h -../../../../src/_sse.h -../../../../src/obidebug.h -../../../../src/libecoPCR/libapat/CODES/dft_code.h -../../../../src/libecoPCR/libapat/CODES/dna_code.h -../../../../src/libecoPCR/libapat/CODES/prot_code.h -../../../../src/libecoPCR/libapat/apat_parse.c -../../../../src/libecoPCR/libapat/apat_search.c -../../../../src/libecoPCR/libapat/apat.h -../../../../src/libecoPCR/libapat/Gmach.h -../../../../src/libecoPCR/libapat/Gtypes.h -../../../../src/libecoPCR/libapat/libstki.c -../../../../src/libecoPCR/libapat/libstki.h -../../../../src/libecoPCR/libthermo/nnparams.h -../../../../src/libecoPCR/libthermo/nnparams.c -../../../../src/libecoPCR/ecoapat.c -../../../../src/libecoPCR/ecodna.c -../../../../src/libecoPCR/ecoError.c -../../../../src/libecoPCR/ecoMalloc.c -../../../../src/libecoPCR/ecoPCR.h - - - - - - - diff --git a/python/obitools3/dms/column/column_idx.cfiles b/python/obitools3/dms/column/column_idx.cfiles deleted file mode 100644 index 19f702c..0000000 --- a/python/obitools3/dms/column/column_idx.cfiles +++ /dev/null @@ -1,110 +0,0 @@ -../../../../src/obi_lcs.h -../../../../src/obi_lcs.c -../../../../src/obierrno.h -../../../../src/obierrno.c -../../../../src/upperband.h -../../../../src/upperband.c -../../../../src/sse_banded_LCS_alignment.h -../../../../src/sse_banded_LCS_alignment.c -../../../../src/obiblob.h -../../../../src/obiblob.c -../../../../src/utils.h -../../../../src/utils.c -../../../../src/obidms.h -../../../../src/obidms.c -../../../../src/libjson/json_utils.h -../../../../src/libjson/json_utils.c -../../../../src/libjson/cJSON.h -../../../../src/libjson/cJSON.c -../../../../src/obiavl.h -../../../../src/obiavl.c -../../../../src/bloom.h -../../../../src/bloom.c -../../../../src/crc64.h -../../../../src/crc64.c -../../../../src/murmurhash2.h -../../../../src/murmurhash2.c -../../../../src/obidmscolumn.h -../../../../src/obidmscolumn.c -../../../../src/obitypes.h -../../../../src/obitypes.c -../../../../src/obidmscolumndir.h -../../../../src/obidmscolumndir.c -../../../../src/obiblob_indexer.h -../../../../src/obiblob_indexer.c -../../../../src/obiview.h -../../../../src/obiview.c -../../../../src/hashtable.h -../../../../src/hashtable.c -../../../../src/linked_list.h -../../../../src/linked_list.c -../../../../src/obidmscolumn_array.h -../../../../src/obidmscolumn_array.c -../../../../src/obidmscolumn_blob.h -../../../../src/obidmscolumn_blob.c -../../../../src/obidmscolumn_idx.h -../../../../src/obidmscolumn_idx.c -../../../../src/obidmscolumn_bool.h -../../../../src/obidmscolumn_bool.c -../../../../src/obidmscolumn_char.h -../../../../src/obidmscolumn_char.c -../../../../src/obidmscolumn_float.h -../../../../src/obidmscolumn_float.c -../../../../src/obidmscolumn_int.h -../../../../src/obidmscolumn_int.c -../../../../src/obidmscolumn_qual.h -../../../../src/obidmscolumn_qual.c -../../../../src/obidmscolumn_seq.h -../../../../src/obidmscolumn_seq.c -../../../../src/obidmscolumn_str.h -../../../../src/obidmscolumn_str.c -../../../../src/array_indexer.h -../../../../src/array_indexer.c -../../../../src/char_str_indexer.h -../../../../src/char_str_indexer.c -../../../../src/dna_seq_indexer.h -../../../../src/dna_seq_indexer.c -../../../../src/encode.c -../../../../src/encode.h -../../../../src/uint8_indexer.c -../../../../src/uint8_indexer.h -../../../../src/build_reference_db.c -../../../../src/build_reference_db.h -../../../../src/kmer_similarity.c -../../../../src/kmer_similarity.h -../../../../src/obi_clean.c -../../../../src/obi_clean.h -../../../../src/obi_ecopcr.c -../../../../src/obi_ecopcr.h -../../../../src/obi_ecotag.c -../../../../src/obi_ecotag.h -../../../../src/obidms_taxonomy.c -../../../../src/obidms_taxonomy.h -../../../../src/obilittlebigman.c -../../../../src/obilittlebigman.h -../../../../src/_sse.h -../../../../src/obidebug.h -../../../../src/libecoPCR/libapat/CODES/dft_code.h -../../../../src/libecoPCR/libapat/CODES/dna_code.h -../../../../src/libecoPCR/libapat/CODES/prot_code.h -../../../../src/libecoPCR/libapat/apat_parse.c -../../../../src/libecoPCR/libapat/apat_search.c -../../../../src/libecoPCR/libapat/apat.h -../../../../src/libecoPCR/libapat/Gmach.h -../../../../src/libecoPCR/libapat/Gtypes.h -../../../../src/libecoPCR/libapat/libstki.c -../../../../src/libecoPCR/libapat/libstki.h -../../../../src/libecoPCR/libthermo/nnparams.h -../../../../src/libecoPCR/libthermo/nnparams.c -../../../../src/libecoPCR/ecoapat.c -../../../../src/libecoPCR/ecodna.c -../../../../src/libecoPCR/ecoError.c -../../../../src/libecoPCR/ecoMalloc.c -../../../../src/libecoPCR/ecoPCR.h - - - - - - - diff --git a/python/obitools3/dms/column/column_idx.pxd b/python/obitools3/dms/column/column_idx.pxd index d0758c7..e5248ee 100755 --- a/python/obitools3/dms/column/column_idx.pxd +++ b/python/obitools3/dms/column/column_idx.pxd @@ -2,7 +2,7 @@ from obitools3.dms.capi.obitypes cimport index_t - +from obitools3.dms.column.column cimport Column cdef class Column_idx(Column) : diff --git a/python/obitools3/dms/column/column_idx.pyx b/python/obitools3/dms/column/column_idx.pyx index a666bf8..8ddd766 100755 --- a/python/obitools3/dms/column/column_idx.pyx +++ b/python/obitools3/dms/column/column_idx.pyx @@ -20,7 +20,7 @@ from obitools3.dms.capi.obitypes cimport OBI_IDX, OBIIdx_NA, index_t from cpython.long cimport PyLong_FromLongLong from obitools3.dms.column.column cimport Column, \ - Column_multi_elts + Column_multi_elts # TODO overwrite other functions from Column and Column_multi_elts diff --git a/python/obitools3/dms/column/typed_column/bool.cfiles b/python/obitools3/dms/column/typed_column/bool.cfiles deleted file mode 100644 index 72668a9..0000000 --- a/python/obitools3/dms/column/typed_column/bool.cfiles +++ /dev/null @@ -1,110 +0,0 @@ -../../../../../src/obi_lcs.h -../../../../../src/obi_lcs.c -../../../../../src/obierrno.h -../../../../../src/obierrno.c -../../../../../src/upperband.h -../../../../../src/upperband.c -../../../../../src/sse_banded_LCS_alignment.h -../../../../../src/sse_banded_LCS_alignment.c -../../../../../src/obiblob.h -../../../../../src/obiblob.c -../../../../../src/utils.h -../../../../../src/utils.c -../../../../../src/obidms.h -../../../../../src/obidms.c -../../../../../src/libjson/json_utils.h -../../../../../src/libjson/json_utils.c -../../../../../src/libjson/cJSON.h -../../../../../src/libjson/cJSON.c -../../../../../src/obiavl.h -../../../../../src/obiavl.c -../../../../../src/bloom.h -../../../../../src/bloom.c -../../../../../src/crc64.h -../../../../../src/crc64.c -../../../../../src/murmurhash2.h -../../../../../src/murmurhash2.c -../../../../../src/obidmscolumn.h -../../../../../src/obidmscolumn.c -../../../../../src/obitypes.h -../../../../../src/obitypes.c -../../../../../src/obidmscolumndir.h -../../../../../src/obidmscolumndir.c -../../../../../src/obiblob_indexer.h -../../../../../src/obiblob_indexer.c -../../../../../src/obiview.h -../../../../../src/obiview.c -../../../../../src/hashtable.h -../../../../../src/hashtable.c -../../../../../src/linked_list.h -../../../../../src/linked_list.c -../../../../../src/obidmscolumn_array.h -../../../../../src/obidmscolumn_array.c -../../../../../src/obidmscolumn_blob.h -../../../../../src/obidmscolumn_blob.c -../../../../../src/obidmscolumn_idx.h -../../../../../src/obidmscolumn_idx.c -../../../../../src/obidmscolumn_bool.h -../../../../../src/obidmscolumn_bool.c -../../../../../src/obidmscolumn_char.h -../../../../../src/obidmscolumn_char.c -../../../../../src/obidmscolumn_float.h -../../../../../src/obidmscolumn_float.c -../../../../../src/obidmscolumn_int.h -../../../../../src/obidmscolumn_int.c -../../../../../src/obidmscolumn_qual.h -../../../../../src/obidmscolumn_qual.c -../../../../../src/obidmscolumn_seq.h -../../../../../src/obidmscolumn_seq.c -../../../../../src/obidmscolumn_str.h -../../../../../src/obidmscolumn_str.c -../../../../../src/array_indexer.h -../../../../../src/array_indexer.c -../../../../../src/char_str_indexer.h -../../../../../src/char_str_indexer.c -../../../../../src/dna_seq_indexer.h -../../../../../src/dna_seq_indexer.c -../../../../../src/encode.c -../../../../../src/encode.h -../../../../../src/uint8_indexer.c -../../../../../src/uint8_indexer.h -../../../../../src/build_reference_db.c -../../../../../src/build_reference_db.h -../../../../../src/kmer_similarity.c -../../../../../src/kmer_similarity.h -../../../../../src/obi_clean.c -../../../../../src/obi_clean.h -../../../../../src/obi_ecopcr.c -../../../../../src/obi_ecopcr.h -../../../../../src/obi_ecotag.c -../../../../../src/obi_ecotag.h -../../../../../src/obidms_taxonomy.c -../../../../../src/obidms_taxonomy.h -../../../../../src/obilittlebigman.c -../../../../../src/obilittlebigman.h -../../../../../src/_sse.h -../../../../../src/obidebug.h -../../../../../src/libecoPCR/libapat/CODES/dft_code.h -../../../../../src/libecoPCR/libapat/CODES/dna_code.h -../../../../../src/libecoPCR/libapat/CODES/prot_code.h -../../../../../src/libecoPCR/libapat/apat_parse.c -../../../../../src/libecoPCR/libapat/apat_search.c -../../../../../src/libecoPCR/libapat/apat.h -../../../../../src/libecoPCR/libapat/Gmach.h -../../../../../src/libecoPCR/libapat/Gtypes.h -../../../../../src/libecoPCR/libapat/libstki.c -../../../../../src/libecoPCR/libapat/libstki.h -../../../../../src/libecoPCR/libthermo/nnparams.h -../../../../../src/libecoPCR/libthermo/nnparams.c -../../../../../src/libecoPCR/ecoapat.c -../../../../../src/libecoPCR/ecodna.c -../../../../../src/libecoPCR/ecoError.c -../../../../../src/libecoPCR/ecoMalloc.c -../../../../../src/libecoPCR/ecoPCR.h - - - - - - - diff --git a/python/obitools3/dms/column/typed_column/char.cfiles b/python/obitools3/dms/column/typed_column/char.cfiles deleted file mode 100644 index 72668a9..0000000 --- a/python/obitools3/dms/column/typed_column/char.cfiles +++ /dev/null @@ -1,110 +0,0 @@ -../../../../../src/obi_lcs.h -../../../../../src/obi_lcs.c -../../../../../src/obierrno.h -../../../../../src/obierrno.c -../../../../../src/upperband.h -../../../../../src/upperband.c -../../../../../src/sse_banded_LCS_alignment.h -../../../../../src/sse_banded_LCS_alignment.c -../../../../../src/obiblob.h -../../../../../src/obiblob.c -../../../../../src/utils.h -../../../../../src/utils.c -../../../../../src/obidms.h -../../../../../src/obidms.c -../../../../../src/libjson/json_utils.h -../../../../../src/libjson/json_utils.c -../../../../../src/libjson/cJSON.h -../../../../../src/libjson/cJSON.c -../../../../../src/obiavl.h -../../../../../src/obiavl.c -../../../../../src/bloom.h -../../../../../src/bloom.c -../../../../../src/crc64.h -../../../../../src/crc64.c -../../../../../src/murmurhash2.h -../../../../../src/murmurhash2.c -../../../../../src/obidmscolumn.h -../../../../../src/obidmscolumn.c -../../../../../src/obitypes.h -../../../../../src/obitypes.c -../../../../../src/obidmscolumndir.h -../../../../../src/obidmscolumndir.c -../../../../../src/obiblob_indexer.h -../../../../../src/obiblob_indexer.c -../../../../../src/obiview.h -../../../../../src/obiview.c -../../../../../src/hashtable.h -../../../../../src/hashtable.c -../../../../../src/linked_list.h -../../../../../src/linked_list.c -../../../../../src/obidmscolumn_array.h -../../../../../src/obidmscolumn_array.c -../../../../../src/obidmscolumn_blob.h -../../../../../src/obidmscolumn_blob.c -../../../../../src/obidmscolumn_idx.h -../../../../../src/obidmscolumn_idx.c -../../../../../src/obidmscolumn_bool.h -../../../../../src/obidmscolumn_bool.c -../../../../../src/obidmscolumn_char.h -../../../../../src/obidmscolumn_char.c -../../../../../src/obidmscolumn_float.h -../../../../../src/obidmscolumn_float.c -../../../../../src/obidmscolumn_int.h -../../../../../src/obidmscolumn_int.c -../../../../../src/obidmscolumn_qual.h -../../../../../src/obidmscolumn_qual.c -../../../../../src/obidmscolumn_seq.h -../../../../../src/obidmscolumn_seq.c -../../../../../src/obidmscolumn_str.h -../../../../../src/obidmscolumn_str.c -../../../../../src/array_indexer.h -../../../../../src/array_indexer.c -../../../../../src/char_str_indexer.h -../../../../../src/char_str_indexer.c -../../../../../src/dna_seq_indexer.h -../../../../../src/dna_seq_indexer.c -../../../../../src/encode.c -../../../../../src/encode.h -../../../../../src/uint8_indexer.c -../../../../../src/uint8_indexer.h -../../../../../src/build_reference_db.c -../../../../../src/build_reference_db.h -../../../../../src/kmer_similarity.c -../../../../../src/kmer_similarity.h -../../../../../src/obi_clean.c -../../../../../src/obi_clean.h -../../../../../src/obi_ecopcr.c -../../../../../src/obi_ecopcr.h -../../../../../src/obi_ecotag.c -../../../../../src/obi_ecotag.h -../../../../../src/obidms_taxonomy.c -../../../../../src/obidms_taxonomy.h -../../../../../src/obilittlebigman.c -../../../../../src/obilittlebigman.h -../../../../../src/_sse.h -../../../../../src/obidebug.h -../../../../../src/libecoPCR/libapat/CODES/dft_code.h -../../../../../src/libecoPCR/libapat/CODES/dna_code.h -../../../../../src/libecoPCR/libapat/CODES/prot_code.h -../../../../../src/libecoPCR/libapat/apat_parse.c -../../../../../src/libecoPCR/libapat/apat_search.c -../../../../../src/libecoPCR/libapat/apat.h -../../../../../src/libecoPCR/libapat/Gmach.h -../../../../../src/libecoPCR/libapat/Gtypes.h -../../../../../src/libecoPCR/libapat/libstki.c -../../../../../src/libecoPCR/libapat/libstki.h -../../../../../src/libecoPCR/libthermo/nnparams.h -../../../../../src/libecoPCR/libthermo/nnparams.c -../../../../../src/libecoPCR/ecoapat.c -../../../../../src/libecoPCR/ecodna.c -../../../../../src/libecoPCR/ecoError.c -../../../../../src/libecoPCR/ecoMalloc.c -../../../../../src/libecoPCR/ecoPCR.h - - - - - - - diff --git a/python/obitools3/dms/column/typed_column/float.cfiles b/python/obitools3/dms/column/typed_column/float.cfiles deleted file mode 100644 index 72668a9..0000000 --- a/python/obitools3/dms/column/typed_column/float.cfiles +++ /dev/null @@ -1,110 +0,0 @@ -../../../../../src/obi_lcs.h -../../../../../src/obi_lcs.c -../../../../../src/obierrno.h -../../../../../src/obierrno.c -../../../../../src/upperband.h -../../../../../src/upperband.c -../../../../../src/sse_banded_LCS_alignment.h -../../../../../src/sse_banded_LCS_alignment.c -../../../../../src/obiblob.h -../../../../../src/obiblob.c -../../../../../src/utils.h -../../../../../src/utils.c -../../../../../src/obidms.h -../../../../../src/obidms.c -../../../../../src/libjson/json_utils.h -../../../../../src/libjson/json_utils.c -../../../../../src/libjson/cJSON.h -../../../../../src/libjson/cJSON.c -../../../../../src/obiavl.h -../../../../../src/obiavl.c -../../../../../src/bloom.h -../../../../../src/bloom.c -../../../../../src/crc64.h -../../../../../src/crc64.c -../../../../../src/murmurhash2.h -../../../../../src/murmurhash2.c -../../../../../src/obidmscolumn.h -../../../../../src/obidmscolumn.c -../../../../../src/obitypes.h -../../../../../src/obitypes.c -../../../../../src/obidmscolumndir.h -../../../../../src/obidmscolumndir.c -../../../../../src/obiblob_indexer.h -../../../../../src/obiblob_indexer.c -../../../../../src/obiview.h -../../../../../src/obiview.c -../../../../../src/hashtable.h -../../../../../src/hashtable.c -../../../../../src/linked_list.h -../../../../../src/linked_list.c -../../../../../src/obidmscolumn_array.h -../../../../../src/obidmscolumn_array.c -../../../../../src/obidmscolumn_blob.h -../../../../../src/obidmscolumn_blob.c -../../../../../src/obidmscolumn_idx.h -../../../../../src/obidmscolumn_idx.c -../../../../../src/obidmscolumn_bool.h -../../../../../src/obidmscolumn_bool.c -../../../../../src/obidmscolumn_char.h -../../../../../src/obidmscolumn_char.c -../../../../../src/obidmscolumn_float.h -../../../../../src/obidmscolumn_float.c -../../../../../src/obidmscolumn_int.h -../../../../../src/obidmscolumn_int.c -../../../../../src/obidmscolumn_qual.h -../../../../../src/obidmscolumn_qual.c -../../../../../src/obidmscolumn_seq.h -../../../../../src/obidmscolumn_seq.c -../../../../../src/obidmscolumn_str.h -../../../../../src/obidmscolumn_str.c -../../../../../src/array_indexer.h -../../../../../src/array_indexer.c -../../../../../src/char_str_indexer.h -../../../../../src/char_str_indexer.c -../../../../../src/dna_seq_indexer.h -../../../../../src/dna_seq_indexer.c -../../../../../src/encode.c -../../../../../src/encode.h -../../../../../src/uint8_indexer.c -../../../../../src/uint8_indexer.h -../../../../../src/build_reference_db.c -../../../../../src/build_reference_db.h -../../../../../src/kmer_similarity.c -../../../../../src/kmer_similarity.h -../../../../../src/obi_clean.c -../../../../../src/obi_clean.h -../../../../../src/obi_ecopcr.c -../../../../../src/obi_ecopcr.h -../../../../../src/obi_ecotag.c -../../../../../src/obi_ecotag.h -../../../../../src/obidms_taxonomy.c -../../../../../src/obidms_taxonomy.h -../../../../../src/obilittlebigman.c -../../../../../src/obilittlebigman.h -../../../../../src/_sse.h -../../../../../src/obidebug.h -../../../../../src/libecoPCR/libapat/CODES/dft_code.h -../../../../../src/libecoPCR/libapat/CODES/dna_code.h -../../../../../src/libecoPCR/libapat/CODES/prot_code.h -../../../../../src/libecoPCR/libapat/apat_parse.c -../../../../../src/libecoPCR/libapat/apat_search.c -../../../../../src/libecoPCR/libapat/apat.h -../../../../../src/libecoPCR/libapat/Gmach.h -../../../../../src/libecoPCR/libapat/Gtypes.h -../../../../../src/libecoPCR/libapat/libstki.c -../../../../../src/libecoPCR/libapat/libstki.h -../../../../../src/libecoPCR/libthermo/nnparams.h -../../../../../src/libecoPCR/libthermo/nnparams.c -../../../../../src/libecoPCR/ecoapat.c -../../../../../src/libecoPCR/ecodna.c -../../../../../src/libecoPCR/ecoError.c -../../../../../src/libecoPCR/ecoMalloc.c -../../../../../src/libecoPCR/ecoPCR.h - - - - - - - diff --git a/python/obitools3/dms/column/typed_column/qual.pxd b/python/obitools3/dms/column/typed_column/qual.pxd index c5ecdbe..b0c0b47 100755 --- a/python/obitools3/dms/column/typed_column/qual.pxd +++ b/python/obitools3/dms/column/typed_column/qual.pxd @@ -3,8 +3,8 @@ from obitools3.dms.capi.obitypes cimport index_t -from obitools3.dms.column_idx cimport Column_idx, \ - Column_multi_elts_idx +from obitools3.dms.column.column_idx cimport Column_idx, \ + Column_multi_elts_idx cdef class Column_qual(Column_idx) : diff --git a/python/obitools3/dms/column/typed_column/qual.pyx b/python/obitools3/dms/column/typed_column/qual.pyx index bae55d1..f45ed88 100755 --- a/python/obitools3/dms/column/typed_column/qual.pyx +++ b/python/obitools3/dms/column/typed_column/qual.pyx @@ -2,16 +2,15 @@ from obitools3.dms.capi.obitypes cimport index_t -from obitools3.dms.column_idx cimport Column_idx, \ - Column_multi_elts_idx +from obitools3.dms.column.column_idx cimport Column_idx, \ + Column_multi_elts_idx from obitools3.dms.capi.obierrno cimport obi_errno -from obitools3.dms.column cimport register_column_class - from obitools3.dms.view.view cimport View -from obitools3.dms.column cimport Column +from obitools3.dms.column.column cimport Column, \ + register_column_class from obitools3.utils cimport tobytes, bytes2str, \ obi_errno_to_exception diff --git a/python/obitools3/dms/column/typed_column/seq.pxd b/python/obitools3/dms/column/typed_column/seq.pxd index 465ed92..7ccf985 100755 --- a/python/obitools3/dms/column/typed_column/seq.pxd +++ b/python/obitools3/dms/column/typed_column/seq.pxd @@ -3,7 +3,7 @@ from obitools3.dms.capi.obitypes cimport index_t -from obitools3.dms.column_idx cimport Column_idx, \ +from obitools3.dms.column.column_idx cimport Column_idx, \ Column_multi_elts_idx diff --git a/python/obitools3/dms/column/typed_column/seq.pyx b/python/obitools3/dms/column/typed_column/seq.pyx index a198765..6c0679b 100755 --- a/python/obitools3/dms/column/typed_column/seq.pyx +++ b/python/obitools3/dms/column/typed_column/seq.pyx @@ -2,7 +2,7 @@ from obitools3.dms.capi.obitypes cimport index_t -from obitools3.dms.column_idx cimport Column_idx, \ +from obitools3.dms.column.column_idx cimport Column_idx, \ Column_multi_elts_idx from obitools3.dms.capi.obierrno cimport obi_errno diff --git a/python/obitools3/dms/column/typed_column/str.pxd b/python/obitools3/dms/column/typed_column/str.pxd index a17d23c..5bb75df 100755 --- a/python/obitools3/dms/column/typed_column/str.pxd +++ b/python/obitools3/dms/column/typed_column/str.pxd @@ -3,7 +3,7 @@ from obitools3.dms.capi.obitypes cimport index_t -from obitools3.dms.column_idx cimport Column_idx, \ +from obitools3.dms.column.column_idx cimport Column_idx, \ Column_multi_elts_idx diff --git a/python/obitools3/dms/column/typed_column/str.pyx b/python/obitools3/dms/column/typed_column/str.pyx index e2fe59c..76e14a5 100755 --- a/python/obitools3/dms/column/typed_column/str.pyx +++ b/python/obitools3/dms/column/typed_column/str.pyx @@ -2,7 +2,7 @@ from obitools3.dms.capi.obitypes cimport index_t -from obitools3.dms.column_idx cimport Column_idx, \ +from obitools3.dms.column.column_idx cimport Column_idx, \ Column_multi_elts_idx diff --git a/python/obitools3/dms/dms.pxd b/python/obitools3/dms/dms.pxd index 6fc3068..25e4319 100755 --- a/python/obitools3/dms/dms.pxd +++ b/python/obitools3/dms/dms.pxd @@ -1,8 +1,8 @@ #cython: language_level=3 -from .object cimport OBIWrapper +from obitools3.dms.object cimport OBIWrapper -from .capi.obidms cimport OBIDMS_p +from obitools3.dms.capi.obidms cimport OBIDMS_p cdef class DMS(OBIWrapper): From 14eca43eac782df335adb7aeda7437bc751fa567 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Tue, 26 Mar 2019 16:17:44 +0100 Subject: [PATCH 05/14] 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 From 7c2787b6b3aebe87b1b1293508f95f15300b83a0 Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Tue, 26 Mar 2019 16:19:55 +0100 Subject: [PATCH 06/14] trying to fix cython difficulties --- python/obitools3/dms/taxo/taxo.pyx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python/obitools3/dms/taxo/taxo.pyx b/python/obitools3/dms/taxo/taxo.pyx index 5ed5ef1..7a70551 100755 --- a/python/obitools3/dms/taxo/taxo.pyx +++ b/python/obitools3/dms/taxo/taxo.pyx @@ -228,7 +228,11 @@ cdef class Taxonomy(OBIWrapper) : cpdef write(self, object prefix) : - if obi_write_taxonomy(self._dms.pointer(), self.pointer(), tobytes(prefix)) < 0 : + cdef DMS dms + cdef OBIDMS_p dms_p + dms = self._dms + dms_p = dms.pointer() + if obi_write_taxonomy(dms_p, self.pointer(), tobytes(prefix)) < 0 : raise Exception("Error writing the taxonomy to binary files") From 6b9da38087f96fa2d81d5e27f8d9033423a0939c Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 29 Mar 2019 15:19:44 +0100 Subject: [PATCH 07/14] patch some relative imports --- python/obitools3/dms/column/column_idx.pxd | 3 ++- python/obitools3/dms/taxo/taxo.pxd | 5 +++-- python/obitools3/dms/taxo/taxo.pyx | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/python/obitools3/dms/column/column_idx.pxd b/python/obitools3/dms/column/column_idx.pxd index e5248ee..2e2c63e 100755 --- a/python/obitools3/dms/column/column_idx.pxd +++ b/python/obitools3/dms/column/column_idx.pxd @@ -2,7 +2,8 @@ from obitools3.dms.capi.obitypes cimport index_t -from obitools3.dms.column.column cimport Column +from obitools3.dms.column.column cimport Column, \ + Column_multi_elts cdef class Column_idx(Column) : diff --git a/python/obitools3/dms/taxo/taxo.pxd b/python/obitools3/dms/taxo/taxo.pxd index a9a1284..e885897 100755 --- a/python/obitools3/dms/taxo/taxo.pxd +++ b/python/obitools3/dms/taxo/taxo.pxd @@ -1,4 +1,4 @@ -#cython: language_level=3 +# cython: language_level=3 from obitools3.dms.capi.obitaxonomy cimport ecotx_t, OBIDMS_taxonomy_p @@ -28,4 +28,5 @@ cdef class Taxonomy(OBIWrapper) : cdef class Taxon : cdef ecotx_t* _pointer - cdef Taxonomy _tax \ No newline at end of file + cdef Taxonomy _tax + \ No newline at end of file diff --git a/python/obitools3/dms/taxo/taxo.pyx b/python/obitools3/dms/taxo/taxo.pyx index 7a70551..2ff403b 100755 --- a/python/obitools3/dms/taxo/taxo.pyx +++ b/python/obitools3/dms/taxo/taxo.pyx @@ -4,7 +4,6 @@ from obitools3.utils cimport str2bytes, bytes2str, tobytes, tostr from obitools3.dms.capi.obitaxonomy cimport ecotx_t, OBIDMS_taxonomy_p from obitools3.dms.dms cimport DMS -from obitools3.dms.dms import DMS from obitools3.dms.object cimport OBIWrapper @@ -321,7 +320,7 @@ cdef class Taxonomy(OBIWrapper) : cdef class Taxon : # TODO dict subclass? def __init__(self, object taxon_capsule, Taxonomy tax) : - self._pointer = PyCapsule_GetPointer(taxon_capsule, NULL) + self._pointer = PyCapsule_GetPointer(taxon_capsule, NULL) if self._pointer == NULL : raise Exception("Error reading a taxon (NULL pointer)") self._tax = tax From 52b8008bdca3a4a4ac60a3f2107de7cfd808252a Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 29 Mar 2019 15:21:30 +0100 Subject: [PATCH 08/14] Add the location of install --- src/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7c6ccc8..95c1564 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.12) set(CMAKE_POSITION_INDEPENDENT_CODE ON) +SET(PYTHONLIB "po" CACHE STRING "Location of the python site-package directory") + project (cobitools3) set(CMAKE_BUILD_TYPE Release) @@ -58,4 +60,7 @@ add_library(cobitools3 SHARED obierrno.c libecoPCR/ecoMalloc.c libecoPCR/ecoError.c obitypes.c - array_indexer.c) \ No newline at end of file + array_indexer.c) + +install(TARGETS cobitools3 DESTINATION ${PYTHONLIB}) + \ No newline at end of file From 460187970feb13376c948e435609a8a1df08cef4 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 29 Mar 2019 15:22:10 +0100 Subject: [PATCH 09/14] First version compiling the code correctly --- setup.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 7951863..023ac7c 100755 --- a/setup.py +++ b/setup.py @@ -11,6 +11,7 @@ from Cython.Build import cythonize import os.path from distutils import log from distutils.extension import Extension +from pip._internal.cli.cmdoptions import build_dir sys.path.append(os.path.abspath("python")) @@ -65,9 +66,10 @@ subprocess.call(['cmake', install_clibdir_option, 'src']) subprocess.call(['make', '-C', 'src','install']) -cython_ext = [Extension('.'.join(["obitools3", - os.path.basename(os.path.dirname(x)), - os.path.splitext(os.path.basename(x))[0]]), + + +cython_ext = [Extension('.'.join([os.path.dirname(x).replace("python/",""), + os.path.splitext(os.path.basename(x))[0]]).replace('/','.'), [x], library_dirs=[get_python_lib()], include_dirs=["src","src/libecoPCR","src/libjson"], @@ -89,7 +91,8 @@ cython_ext = [Extension('.'.join(["obitools3", xx = cythonize(cython_ext, language_level=3, - annotate=True) + annotate=True, + build_dir="build") #, include_path=["src","src/libecoPCR","src/libjson"] From 6c529660336fb81ebea14fd0b7762ba871e445b2 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 29 Mar 2019 15:24:31 +0100 Subject: [PATCH 10/14] Switch back to the original python source from the paster branch --- python/obitools3/apps/temp.pxd | 2 + python/obitools3/apps/temp.pyx | 3 - python/obitools3/dms/column/column.cfiles | 110 ++++++++++++++++++ python/obitools3/dms/column/column.pxd | 17 +-- python/obitools3/dms/column/column.pyx | 26 ++--- python/obitools3/dms/column/column_idx.cfiles | 110 ++++++++++++++++++ python/obitools3/dms/column/column_idx.pxd | 8 +- python/obitools3/dms/column/column_idx.pyx | 11 +- .../dms/column/typed_column/bool.cfiles | 110 ++++++++++++++++++ .../dms/column/typed_column/bool.pxd | 4 +- .../dms/column/typed_column/bool.pyx | 16 +-- .../dms/column/typed_column/char.cfiles | 110 ++++++++++++++++++ .../dms/column/typed_column/char.pxd | 4 +- .../dms/column/typed_column/char.pyx | 17 +-- .../dms/column/typed_column/float.cfiles | 110 ++++++++++++++++++ .../dms/column/typed_column/float.pxd | 4 +- .../dms/column/typed_column/float.pyx | 15 +-- .../dms/column/typed_column/int.cfiles | 110 ++++++++++++++++++ .../obitools3/dms/column/typed_column/int.pxd | 4 +- .../obitools3/dms/column/typed_column/int.pyx | 14 +-- .../dms/column/typed_column/qual.cfiles | 110 ++++++++++++++++++ .../dms/column/typed_column/qual.pxd | 6 +- .../dms/column/typed_column/qual.pyx | 18 ++- .../dms/column/typed_column/seq.cfiles | 110 ++++++++++++++++++ .../obitools3/dms/column/typed_column/seq.pxd | 4 +- .../obitools3/dms/column/typed_column/seq.pyx | 17 ++- .../dms/column/typed_column/str.cfiles | 110 ++++++++++++++++++ .../obitools3/dms/column/typed_column/str.pxd | 4 +- .../obitools3/dms/column/typed_column/str.pyx | 36 +++--- python/obitools3/dms/dms.pxd | 4 +- python/obitools3/dms/taxo/taxo.pxd | 11 +- python/obitools3/dms/taxo/taxo.pyx | 19 +-- python/obitools3/utils.pxd | 2 +- python/obitools3/utils.pyx | 3 +- 34 files changed, 1096 insertions(+), 163 deletions(-) create mode 100644 python/obitools3/dms/column/column.cfiles create mode 100644 python/obitools3/dms/column/column_idx.cfiles create mode 100644 python/obitools3/dms/column/typed_column/bool.cfiles create mode 100644 python/obitools3/dms/column/typed_column/char.cfiles create mode 100644 python/obitools3/dms/column/typed_column/float.cfiles create mode 100644 python/obitools3/dms/column/typed_column/int.cfiles create mode 100644 python/obitools3/dms/column/typed_column/qual.cfiles create mode 100644 python/obitools3/dms/column/typed_column/seq.cfiles create mode 100644 python/obitools3/dms/column/typed_column/str.cfiles diff --git a/python/obitools3/apps/temp.pxd b/python/obitools3/apps/temp.pxd index 2c6c690..252e41d 100755 --- a/python/obitools3/apps/temp.pxd +++ b/python/obitools3/apps/temp.pxd @@ -6,3 +6,5 @@ Created on 28 juillet 2017 @author: coissac ''' +from obitools3.dms.dms cimport DMS +from obitools3.utils cimport tobytes,tostr \ No newline at end of file diff --git a/python/obitools3/apps/temp.pyx b/python/obitools3/apps/temp.pyx index 996189a..eb01da8 100755 --- a/python/obitools3/apps/temp.pyx +++ b/python/obitools3/apps/temp.pyx @@ -17,9 +17,6 @@ from obitools3.dms.dms import DMS from obitools3.apps.config import getConfiguration from obitools3.apps.config import logger -from obitools3.dms.dms cimport DMS -from obitools3.utils cimport tobytes,tostr - cpdef get_temp_dir(): """ Returns a temporary directory object specific of this instance of obitools. diff --git a/python/obitools3/dms/column/column.cfiles b/python/obitools3/dms/column/column.cfiles new file mode 100644 index 0000000..19f702c --- /dev/null +++ b/python/obitools3/dms/column/column.cfiles @@ -0,0 +1,110 @@ +../../../../src/obi_lcs.h +../../../../src/obi_lcs.c +../../../../src/obierrno.h +../../../../src/obierrno.c +../../../../src/upperband.h +../../../../src/upperband.c +../../../../src/sse_banded_LCS_alignment.h +../../../../src/sse_banded_LCS_alignment.c +../../../../src/obiblob.h +../../../../src/obiblob.c +../../../../src/utils.h +../../../../src/utils.c +../../../../src/obidms.h +../../../../src/obidms.c +../../../../src/libjson/json_utils.h +../../../../src/libjson/json_utils.c +../../../../src/libjson/cJSON.h +../../../../src/libjson/cJSON.c +../../../../src/obiavl.h +../../../../src/obiavl.c +../../../../src/bloom.h +../../../../src/bloom.c +../../../../src/crc64.h +../../../../src/crc64.c +../../../../src/murmurhash2.h +../../../../src/murmurhash2.c +../../../../src/obidmscolumn.h +../../../../src/obidmscolumn.c +../../../../src/obitypes.h +../../../../src/obitypes.c +../../../../src/obidmscolumndir.h +../../../../src/obidmscolumndir.c +../../../../src/obiblob_indexer.h +../../../../src/obiblob_indexer.c +../../../../src/obiview.h +../../../../src/obiview.c +../../../../src/hashtable.h +../../../../src/hashtable.c +../../../../src/linked_list.h +../../../../src/linked_list.c +../../../../src/obidmscolumn_array.h +../../../../src/obidmscolumn_array.c +../../../../src/obidmscolumn_blob.h +../../../../src/obidmscolumn_blob.c +../../../../src/obidmscolumn_idx.h +../../../../src/obidmscolumn_idx.c +../../../../src/obidmscolumn_bool.h +../../../../src/obidmscolumn_bool.c +../../../../src/obidmscolumn_char.h +../../../../src/obidmscolumn_char.c +../../../../src/obidmscolumn_float.h +../../../../src/obidmscolumn_float.c +../../../../src/obidmscolumn_int.h +../../../../src/obidmscolumn_int.c +../../../../src/obidmscolumn_qual.h +../../../../src/obidmscolumn_qual.c +../../../../src/obidmscolumn_seq.h +../../../../src/obidmscolumn_seq.c +../../../../src/obidmscolumn_str.h +../../../../src/obidmscolumn_str.c +../../../../src/array_indexer.h +../../../../src/array_indexer.c +../../../../src/char_str_indexer.h +../../../../src/char_str_indexer.c +../../../../src/dna_seq_indexer.h +../../../../src/dna_seq_indexer.c +../../../../src/encode.c +../../../../src/encode.h +../../../../src/uint8_indexer.c +../../../../src/uint8_indexer.h +../../../../src/build_reference_db.c +../../../../src/build_reference_db.h +../../../../src/kmer_similarity.c +../../../../src/kmer_similarity.h +../../../../src/obi_clean.c +../../../../src/obi_clean.h +../../../../src/obi_ecopcr.c +../../../../src/obi_ecopcr.h +../../../../src/obi_ecotag.c +../../../../src/obi_ecotag.h +../../../../src/obidms_taxonomy.c +../../../../src/obidms_taxonomy.h +../../../../src/obilittlebigman.c +../../../../src/obilittlebigman.h +../../../../src/_sse.h +../../../../src/obidebug.h +../../../../src/libecoPCR/libapat/CODES/dft_code.h +../../../../src/libecoPCR/libapat/CODES/dna_code.h +../../../../src/libecoPCR/libapat/CODES/prot_code.h +../../../../src/libecoPCR/libapat/apat_parse.c +../../../../src/libecoPCR/libapat/apat_search.c +../../../../src/libecoPCR/libapat/apat.h +../../../../src/libecoPCR/libapat/Gmach.h +../../../../src/libecoPCR/libapat/Gtypes.h +../../../../src/libecoPCR/libapat/libstki.c +../../../../src/libecoPCR/libapat/libstki.h +../../../../src/libecoPCR/libthermo/nnparams.h +../../../../src/libecoPCR/libthermo/nnparams.c +../../../../src/libecoPCR/ecoapat.c +../../../../src/libecoPCR/ecodna.c +../../../../src/libecoPCR/ecoError.c +../../../../src/libecoPCR/ecoMalloc.c +../../../../src/libecoPCR/ecoPCR.h + + + + + + + diff --git a/python/obitools3/dms/column/column.pxd b/python/obitools3/dms/column/column.pxd index 2dd5e14..7e68906 100755 --- a/python/obitools3/dms/column/column.pxd +++ b/python/obitools3/dms/column/column.pxd @@ -1,21 +1,14 @@ #cython: language_level=3 -from obitools3.dms.capi.obitypes cimport index_t, \ - name_data_type, \ - obitype_t, \ - obiversion_t, \ - OBI_QUAL -from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_header_p, \ - obi_close_column, \ - obi_get_elements_names, \ - obi_column_write_comments +from ..capi.obitypes cimport index_t, \ + obitype_t -from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p +from ..capi.obidmscolumn cimport OBIDMS_column_p -from obitools3.dms.view.view cimport View +from ..view.view cimport View -from obitools3.dms.object cimport OBIWrapper +from ..object cimport OBIWrapper cdef dict __OBIDMS_COLUMN_CLASS__ diff --git a/python/obitools3/dms/column/column.pyx b/python/obitools3/dms/column/column.pyx index fdc338d..aae7f71 100755 --- a/python/obitools3/dms/column/column.pyx +++ b/python/obitools3/dms/column/column.pyx @@ -3,31 +3,27 @@ __OBIDMS_COLUMN_CLASS__ = {} -from obitools3.dms.object cimport OBIWrapper -from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p -from obitools3.dms.capi.obitypes cimport index_t, \ - name_data_type, \ - obitype_t, \ - obiversion_t, \ - OBI_QUAL -from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_header_p, \ +from ..capi.obitypes cimport name_data_type, \ + obitype_t, \ + obiversion_t, \ + OBI_QUAL + +from ..capi.obidms cimport obi_import_column + +from ..capi.obidmscolumn cimport OBIDMS_column_header_p, \ obi_close_column, \ obi_get_elements_names, \ obi_column_write_comments - -from obitools3.dms.capi.obidms cimport obi_import_column -from obitools3.dms.view.view cimport View - -from obitools3.dms.capi.obiutils cimport obi_format_date +from ..capi.obiutils cimport obi_format_date -from obitools3.dms.capi.obiview cimport obi_view_add_column, \ +from ..capi.obiview cimport obi_view_add_column, \ obi_view_get_pointer_on_column_in_view, \ Obiview_p, \ NUC_SEQUENCE_COLUMN -from obitools3.dms.object cimport OBIDeactivatedInstanceError +from ..object cimport OBIDeactivatedInstanceError from obitools3.utils cimport tobytes, \ bytes2str, \ diff --git a/python/obitools3/dms/column/column_idx.cfiles b/python/obitools3/dms/column/column_idx.cfiles new file mode 100644 index 0000000..19f702c --- /dev/null +++ b/python/obitools3/dms/column/column_idx.cfiles @@ -0,0 +1,110 @@ +../../../../src/obi_lcs.h +../../../../src/obi_lcs.c +../../../../src/obierrno.h +../../../../src/obierrno.c +../../../../src/upperband.h +../../../../src/upperband.c +../../../../src/sse_banded_LCS_alignment.h +../../../../src/sse_banded_LCS_alignment.c +../../../../src/obiblob.h +../../../../src/obiblob.c +../../../../src/utils.h +../../../../src/utils.c +../../../../src/obidms.h +../../../../src/obidms.c +../../../../src/libjson/json_utils.h +../../../../src/libjson/json_utils.c +../../../../src/libjson/cJSON.h +../../../../src/libjson/cJSON.c +../../../../src/obiavl.h +../../../../src/obiavl.c +../../../../src/bloom.h +../../../../src/bloom.c +../../../../src/crc64.h +../../../../src/crc64.c +../../../../src/murmurhash2.h +../../../../src/murmurhash2.c +../../../../src/obidmscolumn.h +../../../../src/obidmscolumn.c +../../../../src/obitypes.h +../../../../src/obitypes.c +../../../../src/obidmscolumndir.h +../../../../src/obidmscolumndir.c +../../../../src/obiblob_indexer.h +../../../../src/obiblob_indexer.c +../../../../src/obiview.h +../../../../src/obiview.c +../../../../src/hashtable.h +../../../../src/hashtable.c +../../../../src/linked_list.h +../../../../src/linked_list.c +../../../../src/obidmscolumn_array.h +../../../../src/obidmscolumn_array.c +../../../../src/obidmscolumn_blob.h +../../../../src/obidmscolumn_blob.c +../../../../src/obidmscolumn_idx.h +../../../../src/obidmscolumn_idx.c +../../../../src/obidmscolumn_bool.h +../../../../src/obidmscolumn_bool.c +../../../../src/obidmscolumn_char.h +../../../../src/obidmscolumn_char.c +../../../../src/obidmscolumn_float.h +../../../../src/obidmscolumn_float.c +../../../../src/obidmscolumn_int.h +../../../../src/obidmscolumn_int.c +../../../../src/obidmscolumn_qual.h +../../../../src/obidmscolumn_qual.c +../../../../src/obidmscolumn_seq.h +../../../../src/obidmscolumn_seq.c +../../../../src/obidmscolumn_str.h +../../../../src/obidmscolumn_str.c +../../../../src/array_indexer.h +../../../../src/array_indexer.c +../../../../src/char_str_indexer.h +../../../../src/char_str_indexer.c +../../../../src/dna_seq_indexer.h +../../../../src/dna_seq_indexer.c +../../../../src/encode.c +../../../../src/encode.h +../../../../src/uint8_indexer.c +../../../../src/uint8_indexer.h +../../../../src/build_reference_db.c +../../../../src/build_reference_db.h +../../../../src/kmer_similarity.c +../../../../src/kmer_similarity.h +../../../../src/obi_clean.c +../../../../src/obi_clean.h +../../../../src/obi_ecopcr.c +../../../../src/obi_ecopcr.h +../../../../src/obi_ecotag.c +../../../../src/obi_ecotag.h +../../../../src/obidms_taxonomy.c +../../../../src/obidms_taxonomy.h +../../../../src/obilittlebigman.c +../../../../src/obilittlebigman.h +../../../../src/_sse.h +../../../../src/obidebug.h +../../../../src/libecoPCR/libapat/CODES/dft_code.h +../../../../src/libecoPCR/libapat/CODES/dna_code.h +../../../../src/libecoPCR/libapat/CODES/prot_code.h +../../../../src/libecoPCR/libapat/apat_parse.c +../../../../src/libecoPCR/libapat/apat_search.c +../../../../src/libecoPCR/libapat/apat.h +../../../../src/libecoPCR/libapat/Gmach.h +../../../../src/libecoPCR/libapat/Gtypes.h +../../../../src/libecoPCR/libapat/libstki.c +../../../../src/libecoPCR/libapat/libstki.h +../../../../src/libecoPCR/libthermo/nnparams.h +../../../../src/libecoPCR/libthermo/nnparams.c +../../../../src/libecoPCR/ecoapat.c +../../../../src/libecoPCR/ecodna.c +../../../../src/libecoPCR/ecoError.c +../../../../src/libecoPCR/ecoMalloc.c +../../../../src/libecoPCR/ecoPCR.h + + + + + + + diff --git a/python/obitools3/dms/column/column_idx.pxd b/python/obitools3/dms/column/column_idx.pxd index 2e2c63e..c07c9b7 100755 --- a/python/obitools3/dms/column/column_idx.pxd +++ b/python/obitools3/dms/column/column_idx.pxd @@ -1,9 +1,11 @@ # #cython: language_level=3 -from obitools3.dms.capi.obitypes cimport index_t -from obitools3.dms.column.column cimport Column, \ - Column_multi_elts +from ..capi.obitypes cimport index_t + +from .column cimport Column, \ + Column_multi_elts + cdef class Column_idx(Column) : diff --git a/python/obitools3/dms/column/column_idx.pyx b/python/obitools3/dms/column/column_idx.pyx index 8ddd766..da1bb06 100755 --- a/python/obitools3/dms/column/column_idx.pyx +++ b/python/obitools3/dms/column/column_idx.pyx @@ -2,26 +2,23 @@ from obitools3.dms.capi.obierrno cimport obi_errno -from obitools3.dms.view.view cimport View +from ..view.view cimport View from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from obitools3.dms.capi.obiview cimport obi_get_index_with_elt_name_and_col_p_in_view, \ +from ..capi.obiview cimport obi_get_index_with_elt_name_and_col_p_in_view, \ obi_get_index_with_elt_idx_and_col_p_in_view, \ obi_set_index_with_elt_name_and_col_p_in_view, \ obi_set_index_with_elt_idx_and_col_p_in_view, \ Obiview_p -from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p +from ..capi.obidmscolumn cimport OBIDMS_column_p -from obitools3.dms.capi.obitypes cimport OBI_IDX, OBIIdx_NA, index_t +from ..capi.obitypes cimport OBI_IDX, OBIIdx_NA, index_t from cpython.long cimport PyLong_FromLongLong -from obitools3.dms.column.column cimport Column, \ - Column_multi_elts - # TODO overwrite other functions from Column and Column_multi_elts diff --git a/python/obitools3/dms/column/typed_column/bool.cfiles b/python/obitools3/dms/column/typed_column/bool.cfiles new file mode 100644 index 0000000..72668a9 --- /dev/null +++ b/python/obitools3/dms/column/typed_column/bool.cfiles @@ -0,0 +1,110 @@ +../../../../../src/obi_lcs.h +../../../../../src/obi_lcs.c +../../../../../src/obierrno.h +../../../../../src/obierrno.c +../../../../../src/upperband.h +../../../../../src/upperband.c +../../../../../src/sse_banded_LCS_alignment.h +../../../../../src/sse_banded_LCS_alignment.c +../../../../../src/obiblob.h +../../../../../src/obiblob.c +../../../../../src/utils.h +../../../../../src/utils.c +../../../../../src/obidms.h +../../../../../src/obidms.c +../../../../../src/libjson/json_utils.h +../../../../../src/libjson/json_utils.c +../../../../../src/libjson/cJSON.h +../../../../../src/libjson/cJSON.c +../../../../../src/obiavl.h +../../../../../src/obiavl.c +../../../../../src/bloom.h +../../../../../src/bloom.c +../../../../../src/crc64.h +../../../../../src/crc64.c +../../../../../src/murmurhash2.h +../../../../../src/murmurhash2.c +../../../../../src/obidmscolumn.h +../../../../../src/obidmscolumn.c +../../../../../src/obitypes.h +../../../../../src/obitypes.c +../../../../../src/obidmscolumndir.h +../../../../../src/obidmscolumndir.c +../../../../../src/obiblob_indexer.h +../../../../../src/obiblob_indexer.c +../../../../../src/obiview.h +../../../../../src/obiview.c +../../../../../src/hashtable.h +../../../../../src/hashtable.c +../../../../../src/linked_list.h +../../../../../src/linked_list.c +../../../../../src/obidmscolumn_array.h +../../../../../src/obidmscolumn_array.c +../../../../../src/obidmscolumn_blob.h +../../../../../src/obidmscolumn_blob.c +../../../../../src/obidmscolumn_idx.h +../../../../../src/obidmscolumn_idx.c +../../../../../src/obidmscolumn_bool.h +../../../../../src/obidmscolumn_bool.c +../../../../../src/obidmscolumn_char.h +../../../../../src/obidmscolumn_char.c +../../../../../src/obidmscolumn_float.h +../../../../../src/obidmscolumn_float.c +../../../../../src/obidmscolumn_int.h +../../../../../src/obidmscolumn_int.c +../../../../../src/obidmscolumn_qual.h +../../../../../src/obidmscolumn_qual.c +../../../../../src/obidmscolumn_seq.h +../../../../../src/obidmscolumn_seq.c +../../../../../src/obidmscolumn_str.h +../../../../../src/obidmscolumn_str.c +../../../../../src/array_indexer.h +../../../../../src/array_indexer.c +../../../../../src/char_str_indexer.h +../../../../../src/char_str_indexer.c +../../../../../src/dna_seq_indexer.h +../../../../../src/dna_seq_indexer.c +../../../../../src/encode.c +../../../../../src/encode.h +../../../../../src/uint8_indexer.c +../../../../../src/uint8_indexer.h +../../../../../src/build_reference_db.c +../../../../../src/build_reference_db.h +../../../../../src/kmer_similarity.c +../../../../../src/kmer_similarity.h +../../../../../src/obi_clean.c +../../../../../src/obi_clean.h +../../../../../src/obi_ecopcr.c +../../../../../src/obi_ecopcr.h +../../../../../src/obi_ecotag.c +../../../../../src/obi_ecotag.h +../../../../../src/obidms_taxonomy.c +../../../../../src/obidms_taxonomy.h +../../../../../src/obilittlebigman.c +../../../../../src/obilittlebigman.h +../../../../../src/_sse.h +../../../../../src/obidebug.h +../../../../../src/libecoPCR/libapat/CODES/dft_code.h +../../../../../src/libecoPCR/libapat/CODES/dna_code.h +../../../../../src/libecoPCR/libapat/CODES/prot_code.h +../../../../../src/libecoPCR/libapat/apat_parse.c +../../../../../src/libecoPCR/libapat/apat_search.c +../../../../../src/libecoPCR/libapat/apat.h +../../../../../src/libecoPCR/libapat/Gmach.h +../../../../../src/libecoPCR/libapat/Gtypes.h +../../../../../src/libecoPCR/libapat/libstki.c +../../../../../src/libecoPCR/libapat/libstki.h +../../../../../src/libecoPCR/libthermo/nnparams.h +../../../../../src/libecoPCR/libthermo/nnparams.c +../../../../../src/libecoPCR/ecoapat.c +../../../../../src/libecoPCR/ecodna.c +../../../../../src/libecoPCR/ecoError.c +../../../../../src/libecoPCR/ecoMalloc.c +../../../../../src/libecoPCR/ecoPCR.h + + + + + + + diff --git a/python/obitools3/dms/column/typed_column/bool.pxd b/python/obitools3/dms/column/typed_column/bool.pxd index 22cf51b..41209c0 100755 --- a/python/obitools3/dms/column/typed_column/bool.pxd +++ b/python/obitools3/dms/column/typed_column/bool.pxd @@ -1,9 +1,9 @@ # #cython: language_level=3 -from obitools3.dms.capi.obitypes cimport index_t +from ...capi.obitypes cimport index_t -from obitools3.dms.column.column cimport Column, \ +from ..column cimport Column, \ Column_multi_elts diff --git a/python/obitools3/dms/column/typed_column/bool.pyx b/python/obitools3/dms/column/typed_column/bool.pyx index ae113b8..54377fd 100755 --- a/python/obitools3/dms/column/typed_column/bool.pyx +++ b/python/obitools3/dms/column/typed_column/bool.pyx @@ -2,20 +2,14 @@ from obitools3.dms.capi.obierrno cimport obi_errno -from obitools3.dms.column.column cimport Column, \ - Column_multi_elts +from ..column cimport register_column_class -from obitools3.dms.capi.obitypes cimport index_t - - -from obitools3.dms.column.column cimport register_column_class - -from obitools3.dms.view.view cimport View +from ...view.view cimport View from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from obitools3.dms.capi.obiview cimport obi_get_bool_with_elt_name_and_col_p_in_view, \ +from ...capi.obiview cimport obi_get_bool_with_elt_name_and_col_p_in_view, \ obi_get_bool_with_elt_idx_and_col_p_in_view, \ obi_set_bool_with_elt_name_and_col_p_in_view, \ obi_set_bool_with_elt_idx_and_col_p_in_view, \ @@ -23,9 +17,9 @@ from obitools3.dms.capi.obiview cimport obi_get_bool_with_elt_name_and_col_p_in_ obi_set_array_with_col_p_in_view, \ Obiview_p -from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p +from ...capi.obidmscolumn cimport OBIDMS_column_p -from obitools3.dms.capi.obitypes cimport OBI_BOOL, \ +from ...capi.obitypes cimport OBI_BOOL, \ OBIBool_NA, \ OBITuple_NA, \ obibool_t diff --git a/python/obitools3/dms/column/typed_column/char.cfiles b/python/obitools3/dms/column/typed_column/char.cfiles new file mode 100644 index 0000000..72668a9 --- /dev/null +++ b/python/obitools3/dms/column/typed_column/char.cfiles @@ -0,0 +1,110 @@ +../../../../../src/obi_lcs.h +../../../../../src/obi_lcs.c +../../../../../src/obierrno.h +../../../../../src/obierrno.c +../../../../../src/upperband.h +../../../../../src/upperband.c +../../../../../src/sse_banded_LCS_alignment.h +../../../../../src/sse_banded_LCS_alignment.c +../../../../../src/obiblob.h +../../../../../src/obiblob.c +../../../../../src/utils.h +../../../../../src/utils.c +../../../../../src/obidms.h +../../../../../src/obidms.c +../../../../../src/libjson/json_utils.h +../../../../../src/libjson/json_utils.c +../../../../../src/libjson/cJSON.h +../../../../../src/libjson/cJSON.c +../../../../../src/obiavl.h +../../../../../src/obiavl.c +../../../../../src/bloom.h +../../../../../src/bloom.c +../../../../../src/crc64.h +../../../../../src/crc64.c +../../../../../src/murmurhash2.h +../../../../../src/murmurhash2.c +../../../../../src/obidmscolumn.h +../../../../../src/obidmscolumn.c +../../../../../src/obitypes.h +../../../../../src/obitypes.c +../../../../../src/obidmscolumndir.h +../../../../../src/obidmscolumndir.c +../../../../../src/obiblob_indexer.h +../../../../../src/obiblob_indexer.c +../../../../../src/obiview.h +../../../../../src/obiview.c +../../../../../src/hashtable.h +../../../../../src/hashtable.c +../../../../../src/linked_list.h +../../../../../src/linked_list.c +../../../../../src/obidmscolumn_array.h +../../../../../src/obidmscolumn_array.c +../../../../../src/obidmscolumn_blob.h +../../../../../src/obidmscolumn_blob.c +../../../../../src/obidmscolumn_idx.h +../../../../../src/obidmscolumn_idx.c +../../../../../src/obidmscolumn_bool.h +../../../../../src/obidmscolumn_bool.c +../../../../../src/obidmscolumn_char.h +../../../../../src/obidmscolumn_char.c +../../../../../src/obidmscolumn_float.h +../../../../../src/obidmscolumn_float.c +../../../../../src/obidmscolumn_int.h +../../../../../src/obidmscolumn_int.c +../../../../../src/obidmscolumn_qual.h +../../../../../src/obidmscolumn_qual.c +../../../../../src/obidmscolumn_seq.h +../../../../../src/obidmscolumn_seq.c +../../../../../src/obidmscolumn_str.h +../../../../../src/obidmscolumn_str.c +../../../../../src/array_indexer.h +../../../../../src/array_indexer.c +../../../../../src/char_str_indexer.h +../../../../../src/char_str_indexer.c +../../../../../src/dna_seq_indexer.h +../../../../../src/dna_seq_indexer.c +../../../../../src/encode.c +../../../../../src/encode.h +../../../../../src/uint8_indexer.c +../../../../../src/uint8_indexer.h +../../../../../src/build_reference_db.c +../../../../../src/build_reference_db.h +../../../../../src/kmer_similarity.c +../../../../../src/kmer_similarity.h +../../../../../src/obi_clean.c +../../../../../src/obi_clean.h +../../../../../src/obi_ecopcr.c +../../../../../src/obi_ecopcr.h +../../../../../src/obi_ecotag.c +../../../../../src/obi_ecotag.h +../../../../../src/obidms_taxonomy.c +../../../../../src/obidms_taxonomy.h +../../../../../src/obilittlebigman.c +../../../../../src/obilittlebigman.h +../../../../../src/_sse.h +../../../../../src/obidebug.h +../../../../../src/libecoPCR/libapat/CODES/dft_code.h +../../../../../src/libecoPCR/libapat/CODES/dna_code.h +../../../../../src/libecoPCR/libapat/CODES/prot_code.h +../../../../../src/libecoPCR/libapat/apat_parse.c +../../../../../src/libecoPCR/libapat/apat_search.c +../../../../../src/libecoPCR/libapat/apat.h +../../../../../src/libecoPCR/libapat/Gmach.h +../../../../../src/libecoPCR/libapat/Gtypes.h +../../../../../src/libecoPCR/libapat/libstki.c +../../../../../src/libecoPCR/libapat/libstki.h +../../../../../src/libecoPCR/libthermo/nnparams.h +../../../../../src/libecoPCR/libthermo/nnparams.c +../../../../../src/libecoPCR/ecoapat.c +../../../../../src/libecoPCR/ecodna.c +../../../../../src/libecoPCR/ecoError.c +../../../../../src/libecoPCR/ecoMalloc.c +../../../../../src/libecoPCR/ecoPCR.h + + + + + + + diff --git a/python/obitools3/dms/column/typed_column/char.pxd b/python/obitools3/dms/column/typed_column/char.pxd index 7614c4f..c67db85 100755 --- a/python/obitools3/dms/column/typed_column/char.pxd +++ b/python/obitools3/dms/column/typed_column/char.pxd @@ -1,9 +1,9 @@ # #cython: language_level=3 -from obitools3.dms.capi.obitypes cimport index_t +from ...capi.obitypes cimport index_t -from obitools3.dms.column.column cimport Column, \ +from ..column cimport Column, \ Column_multi_elts diff --git a/python/obitools3/dms/column/typed_column/char.pyx b/python/obitools3/dms/column/typed_column/char.pyx index d4e8c39..1ba7e89 100755 --- a/python/obitools3/dms/column/typed_column/char.pyx +++ b/python/obitools3/dms/column/typed_column/char.pyx @@ -1,20 +1,15 @@ #cython: language_level=3 from obitools3.dms.capi.obierrno cimport obi_errno -from obitools3.dms.capi.obitypes cimport index_t -from obitools3.dms.column.column cimport Column, \ - Column_multi_elts +from ..column cimport register_column_class - -from obitools3.dms.column.column cimport register_column_class - -from obitools3.dms.view.view cimport View +from ...view.view cimport View from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from obitools3.dms.capi.obiview cimport obi_get_char_with_elt_name_and_col_p_in_view, \ +from ...capi.obiview cimport obi_get_char_with_elt_name_and_col_p_in_view, \ obi_get_char_with_elt_idx_and_col_p_in_view, \ obi_set_char_with_elt_name_and_col_p_in_view, \ obi_set_char_with_elt_idx_and_col_p_in_view, \ @@ -22,9 +17,9 @@ from obitools3.dms.capi.obiview cimport obi_get_char_with_elt_name_and_col_p_in_ obi_set_array_with_col_p_in_view, \ Obiview_p -from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p +from ...capi.obidmscolumn cimport OBIDMS_column_p -from obitools3.dms.capi.obitypes cimport OBI_CHAR, \ +from ...capi.obitypes cimport OBI_CHAR, \ OBIChar_NA, \ OBITuple_NA, \ obichar_t @@ -121,7 +116,7 @@ cdef class Column_multi_elts_char(Column_multi_elts): cpdef set_item(self, index_t line_nb, object elt_id, object value) : global obi_errno - cdef bytes elt_name + cdef bytes elt_name cdef obichar_t value_b if value is None : value_b = OBIChar_NA diff --git a/python/obitools3/dms/column/typed_column/float.cfiles b/python/obitools3/dms/column/typed_column/float.cfiles new file mode 100644 index 0000000..72668a9 --- /dev/null +++ b/python/obitools3/dms/column/typed_column/float.cfiles @@ -0,0 +1,110 @@ +../../../../../src/obi_lcs.h +../../../../../src/obi_lcs.c +../../../../../src/obierrno.h +../../../../../src/obierrno.c +../../../../../src/upperband.h +../../../../../src/upperband.c +../../../../../src/sse_banded_LCS_alignment.h +../../../../../src/sse_banded_LCS_alignment.c +../../../../../src/obiblob.h +../../../../../src/obiblob.c +../../../../../src/utils.h +../../../../../src/utils.c +../../../../../src/obidms.h +../../../../../src/obidms.c +../../../../../src/libjson/json_utils.h +../../../../../src/libjson/json_utils.c +../../../../../src/libjson/cJSON.h +../../../../../src/libjson/cJSON.c +../../../../../src/obiavl.h +../../../../../src/obiavl.c +../../../../../src/bloom.h +../../../../../src/bloom.c +../../../../../src/crc64.h +../../../../../src/crc64.c +../../../../../src/murmurhash2.h +../../../../../src/murmurhash2.c +../../../../../src/obidmscolumn.h +../../../../../src/obidmscolumn.c +../../../../../src/obitypes.h +../../../../../src/obitypes.c +../../../../../src/obidmscolumndir.h +../../../../../src/obidmscolumndir.c +../../../../../src/obiblob_indexer.h +../../../../../src/obiblob_indexer.c +../../../../../src/obiview.h +../../../../../src/obiview.c +../../../../../src/hashtable.h +../../../../../src/hashtable.c +../../../../../src/linked_list.h +../../../../../src/linked_list.c +../../../../../src/obidmscolumn_array.h +../../../../../src/obidmscolumn_array.c +../../../../../src/obidmscolumn_blob.h +../../../../../src/obidmscolumn_blob.c +../../../../../src/obidmscolumn_idx.h +../../../../../src/obidmscolumn_idx.c +../../../../../src/obidmscolumn_bool.h +../../../../../src/obidmscolumn_bool.c +../../../../../src/obidmscolumn_char.h +../../../../../src/obidmscolumn_char.c +../../../../../src/obidmscolumn_float.h +../../../../../src/obidmscolumn_float.c +../../../../../src/obidmscolumn_int.h +../../../../../src/obidmscolumn_int.c +../../../../../src/obidmscolumn_qual.h +../../../../../src/obidmscolumn_qual.c +../../../../../src/obidmscolumn_seq.h +../../../../../src/obidmscolumn_seq.c +../../../../../src/obidmscolumn_str.h +../../../../../src/obidmscolumn_str.c +../../../../../src/array_indexer.h +../../../../../src/array_indexer.c +../../../../../src/char_str_indexer.h +../../../../../src/char_str_indexer.c +../../../../../src/dna_seq_indexer.h +../../../../../src/dna_seq_indexer.c +../../../../../src/encode.c +../../../../../src/encode.h +../../../../../src/uint8_indexer.c +../../../../../src/uint8_indexer.h +../../../../../src/build_reference_db.c +../../../../../src/build_reference_db.h +../../../../../src/kmer_similarity.c +../../../../../src/kmer_similarity.h +../../../../../src/obi_clean.c +../../../../../src/obi_clean.h +../../../../../src/obi_ecopcr.c +../../../../../src/obi_ecopcr.h +../../../../../src/obi_ecotag.c +../../../../../src/obi_ecotag.h +../../../../../src/obidms_taxonomy.c +../../../../../src/obidms_taxonomy.h +../../../../../src/obilittlebigman.c +../../../../../src/obilittlebigman.h +../../../../../src/_sse.h +../../../../../src/obidebug.h +../../../../../src/libecoPCR/libapat/CODES/dft_code.h +../../../../../src/libecoPCR/libapat/CODES/dna_code.h +../../../../../src/libecoPCR/libapat/CODES/prot_code.h +../../../../../src/libecoPCR/libapat/apat_parse.c +../../../../../src/libecoPCR/libapat/apat_search.c +../../../../../src/libecoPCR/libapat/apat.h +../../../../../src/libecoPCR/libapat/Gmach.h +../../../../../src/libecoPCR/libapat/Gtypes.h +../../../../../src/libecoPCR/libapat/libstki.c +../../../../../src/libecoPCR/libapat/libstki.h +../../../../../src/libecoPCR/libthermo/nnparams.h +../../../../../src/libecoPCR/libthermo/nnparams.c +../../../../../src/libecoPCR/ecoapat.c +../../../../../src/libecoPCR/ecodna.c +../../../../../src/libecoPCR/ecoError.c +../../../../../src/libecoPCR/ecoMalloc.c +../../../../../src/libecoPCR/ecoPCR.h + + + + + + + diff --git a/python/obitools3/dms/column/typed_column/float.pxd b/python/obitools3/dms/column/typed_column/float.pxd index edd898e..07e9f7b 100755 --- a/python/obitools3/dms/column/typed_column/float.pxd +++ b/python/obitools3/dms/column/typed_column/float.pxd @@ -1,9 +1,9 @@ # #cython: language_level=3 -from obitools3.dms.capi.obitypes cimport index_t +from ...capi.obitypes cimport index_t -from obitools3.dms.column.column cimport Column, \ +from ..column cimport Column, \ Column_multi_elts diff --git a/python/obitools3/dms/column/typed_column/float.pyx b/python/obitools3/dms/column/typed_column/float.pyx index f00e123..3a0702b 100755 --- a/python/obitools3/dms/column/typed_column/float.pyx +++ b/python/obitools3/dms/column/typed_column/float.pyx @@ -1,20 +1,15 @@ #cython: language_level=3 from obitools3.dms.capi.obierrno cimport obi_errno -from obitools3.dms.capi.obitypes cimport index_t -from obitools3.dms.column.column cimport Column, \ - Column_multi_elts +from ..column cimport register_column_class - -from obitools3.dms.column.column cimport register_column_class - -from obitools3.dms.view.view cimport View +from ...view.view cimport View from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from obitools3.dms.capi.obiview cimport obi_get_float_with_elt_name_and_col_p_in_view, \ +from ...capi.obiview cimport obi_get_float_with_elt_name_and_col_p_in_view, \ obi_get_float_with_elt_idx_and_col_p_in_view, \ obi_set_float_with_elt_name_and_col_p_in_view, \ obi_set_float_with_elt_idx_and_col_p_in_view, \ @@ -22,9 +17,9 @@ from obitools3.dms.capi.obiview cimport obi_get_float_with_elt_name_and_col_p_in obi_set_array_with_col_p_in_view, \ Obiview_p -from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p +from ...capi.obidmscolumn cimport OBIDMS_column_p -from obitools3.dms.capi.obitypes cimport OBI_FLOAT, \ +from ...capi.obitypes cimport OBI_FLOAT, \ OBIFloat_NA, \ OBITuple_NA, \ obifloat_t diff --git a/python/obitools3/dms/column/typed_column/int.cfiles b/python/obitools3/dms/column/typed_column/int.cfiles new file mode 100644 index 0000000..72668a9 --- /dev/null +++ b/python/obitools3/dms/column/typed_column/int.cfiles @@ -0,0 +1,110 @@ +../../../../../src/obi_lcs.h +../../../../../src/obi_lcs.c +../../../../../src/obierrno.h +../../../../../src/obierrno.c +../../../../../src/upperband.h +../../../../../src/upperband.c +../../../../../src/sse_banded_LCS_alignment.h +../../../../../src/sse_banded_LCS_alignment.c +../../../../../src/obiblob.h +../../../../../src/obiblob.c +../../../../../src/utils.h +../../../../../src/utils.c +../../../../../src/obidms.h +../../../../../src/obidms.c +../../../../../src/libjson/json_utils.h +../../../../../src/libjson/json_utils.c +../../../../../src/libjson/cJSON.h +../../../../../src/libjson/cJSON.c +../../../../../src/obiavl.h +../../../../../src/obiavl.c +../../../../../src/bloom.h +../../../../../src/bloom.c +../../../../../src/crc64.h +../../../../../src/crc64.c +../../../../../src/murmurhash2.h +../../../../../src/murmurhash2.c +../../../../../src/obidmscolumn.h +../../../../../src/obidmscolumn.c +../../../../../src/obitypes.h +../../../../../src/obitypes.c +../../../../../src/obidmscolumndir.h +../../../../../src/obidmscolumndir.c +../../../../../src/obiblob_indexer.h +../../../../../src/obiblob_indexer.c +../../../../../src/obiview.h +../../../../../src/obiview.c +../../../../../src/hashtable.h +../../../../../src/hashtable.c +../../../../../src/linked_list.h +../../../../../src/linked_list.c +../../../../../src/obidmscolumn_array.h +../../../../../src/obidmscolumn_array.c +../../../../../src/obidmscolumn_blob.h +../../../../../src/obidmscolumn_blob.c +../../../../../src/obidmscolumn_idx.h +../../../../../src/obidmscolumn_idx.c +../../../../../src/obidmscolumn_bool.h +../../../../../src/obidmscolumn_bool.c +../../../../../src/obidmscolumn_char.h +../../../../../src/obidmscolumn_char.c +../../../../../src/obidmscolumn_float.h +../../../../../src/obidmscolumn_float.c +../../../../../src/obidmscolumn_int.h +../../../../../src/obidmscolumn_int.c +../../../../../src/obidmscolumn_qual.h +../../../../../src/obidmscolumn_qual.c +../../../../../src/obidmscolumn_seq.h +../../../../../src/obidmscolumn_seq.c +../../../../../src/obidmscolumn_str.h +../../../../../src/obidmscolumn_str.c +../../../../../src/array_indexer.h +../../../../../src/array_indexer.c +../../../../../src/char_str_indexer.h +../../../../../src/char_str_indexer.c +../../../../../src/dna_seq_indexer.h +../../../../../src/dna_seq_indexer.c +../../../../../src/encode.c +../../../../../src/encode.h +../../../../../src/uint8_indexer.c +../../../../../src/uint8_indexer.h +../../../../../src/build_reference_db.c +../../../../../src/build_reference_db.h +../../../../../src/kmer_similarity.c +../../../../../src/kmer_similarity.h +../../../../../src/obi_clean.c +../../../../../src/obi_clean.h +../../../../../src/obi_ecopcr.c +../../../../../src/obi_ecopcr.h +../../../../../src/obi_ecotag.c +../../../../../src/obi_ecotag.h +../../../../../src/obidms_taxonomy.c +../../../../../src/obidms_taxonomy.h +../../../../../src/obilittlebigman.c +../../../../../src/obilittlebigman.h +../../../../../src/_sse.h +../../../../../src/obidebug.h +../../../../../src/libecoPCR/libapat/CODES/dft_code.h +../../../../../src/libecoPCR/libapat/CODES/dna_code.h +../../../../../src/libecoPCR/libapat/CODES/prot_code.h +../../../../../src/libecoPCR/libapat/apat_parse.c +../../../../../src/libecoPCR/libapat/apat_search.c +../../../../../src/libecoPCR/libapat/apat.h +../../../../../src/libecoPCR/libapat/Gmach.h +../../../../../src/libecoPCR/libapat/Gtypes.h +../../../../../src/libecoPCR/libapat/libstki.c +../../../../../src/libecoPCR/libapat/libstki.h +../../../../../src/libecoPCR/libthermo/nnparams.h +../../../../../src/libecoPCR/libthermo/nnparams.c +../../../../../src/libecoPCR/ecoapat.c +../../../../../src/libecoPCR/ecodna.c +../../../../../src/libecoPCR/ecoError.c +../../../../../src/libecoPCR/ecoMalloc.c +../../../../../src/libecoPCR/ecoPCR.h + + + + + + + diff --git a/python/obitools3/dms/column/typed_column/int.pxd b/python/obitools3/dms/column/typed_column/int.pxd index 51be9f3..0cac022 100755 --- a/python/obitools3/dms/column/typed_column/int.pxd +++ b/python/obitools3/dms/column/typed_column/int.pxd @@ -1,9 +1,9 @@ # #cython: language_level=3 -from obitools3.dms.capi.obitypes cimport index_t +from ...capi.obitypes cimport index_t -from obitools3.dms.column.column cimport Column, \ +from ..column cimport Column, \ Column_multi_elts diff --git a/python/obitools3/dms/column/typed_column/int.pyx b/python/obitools3/dms/column/typed_column/int.pyx index 2359d0a..5d9150e 100755 --- a/python/obitools3/dms/column/typed_column/int.pyx +++ b/python/obitools3/dms/column/typed_column/int.pyx @@ -1,19 +1,15 @@ #cython: language_level=3 from obitools3.dms.capi.obierrno cimport obi_errno -from obitools3.dms.capi.obitypes cimport index_t -from obitools3.dms.column.column cimport Column, \ - Column_multi_elts +from ..column cimport register_column_class -from obitools3.dms.column.column cimport register_column_class - -from obitools3.dms.view.view cimport View +from ...view.view cimport View from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from obitools3.dms.capi.obiview cimport obi_get_int_with_elt_name_and_col_p_in_view, \ +from ...capi.obiview cimport obi_get_int_with_elt_name_and_col_p_in_view, \ obi_get_int_with_elt_idx_and_col_p_in_view, \ obi_set_int_with_elt_name_and_col_p_in_view, \ obi_set_int_with_elt_idx_and_col_p_in_view, \ @@ -21,9 +17,9 @@ from obitools3.dms.capi.obiview cimport obi_get_int_with_elt_name_and_col_p_in_v obi_set_array_with_col_p_in_view, \ Obiview_p -from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p +from ...capi.obidmscolumn cimport OBIDMS_column_p -from obitools3.dms.capi.obitypes cimport OBI_INT, \ +from ...capi.obitypes cimport OBI_INT, \ OBIInt_NA, \ OBITuple_NA, \ obiint_t diff --git a/python/obitools3/dms/column/typed_column/qual.cfiles b/python/obitools3/dms/column/typed_column/qual.cfiles new file mode 100644 index 0000000..72668a9 --- /dev/null +++ b/python/obitools3/dms/column/typed_column/qual.cfiles @@ -0,0 +1,110 @@ +../../../../../src/obi_lcs.h +../../../../../src/obi_lcs.c +../../../../../src/obierrno.h +../../../../../src/obierrno.c +../../../../../src/upperband.h +../../../../../src/upperband.c +../../../../../src/sse_banded_LCS_alignment.h +../../../../../src/sse_banded_LCS_alignment.c +../../../../../src/obiblob.h +../../../../../src/obiblob.c +../../../../../src/utils.h +../../../../../src/utils.c +../../../../../src/obidms.h +../../../../../src/obidms.c +../../../../../src/libjson/json_utils.h +../../../../../src/libjson/json_utils.c +../../../../../src/libjson/cJSON.h +../../../../../src/libjson/cJSON.c +../../../../../src/obiavl.h +../../../../../src/obiavl.c +../../../../../src/bloom.h +../../../../../src/bloom.c +../../../../../src/crc64.h +../../../../../src/crc64.c +../../../../../src/murmurhash2.h +../../../../../src/murmurhash2.c +../../../../../src/obidmscolumn.h +../../../../../src/obidmscolumn.c +../../../../../src/obitypes.h +../../../../../src/obitypes.c +../../../../../src/obidmscolumndir.h +../../../../../src/obidmscolumndir.c +../../../../../src/obiblob_indexer.h +../../../../../src/obiblob_indexer.c +../../../../../src/obiview.h +../../../../../src/obiview.c +../../../../../src/hashtable.h +../../../../../src/hashtable.c +../../../../../src/linked_list.h +../../../../../src/linked_list.c +../../../../../src/obidmscolumn_array.h +../../../../../src/obidmscolumn_array.c +../../../../../src/obidmscolumn_blob.h +../../../../../src/obidmscolumn_blob.c +../../../../../src/obidmscolumn_idx.h +../../../../../src/obidmscolumn_idx.c +../../../../../src/obidmscolumn_bool.h +../../../../../src/obidmscolumn_bool.c +../../../../../src/obidmscolumn_char.h +../../../../../src/obidmscolumn_char.c +../../../../../src/obidmscolumn_float.h +../../../../../src/obidmscolumn_float.c +../../../../../src/obidmscolumn_int.h +../../../../../src/obidmscolumn_int.c +../../../../../src/obidmscolumn_qual.h +../../../../../src/obidmscolumn_qual.c +../../../../../src/obidmscolumn_seq.h +../../../../../src/obidmscolumn_seq.c +../../../../../src/obidmscolumn_str.h +../../../../../src/obidmscolumn_str.c +../../../../../src/array_indexer.h +../../../../../src/array_indexer.c +../../../../../src/char_str_indexer.h +../../../../../src/char_str_indexer.c +../../../../../src/dna_seq_indexer.h +../../../../../src/dna_seq_indexer.c +../../../../../src/encode.c +../../../../../src/encode.h +../../../../../src/uint8_indexer.c +../../../../../src/uint8_indexer.h +../../../../../src/build_reference_db.c +../../../../../src/build_reference_db.h +../../../../../src/kmer_similarity.c +../../../../../src/kmer_similarity.h +../../../../../src/obi_clean.c +../../../../../src/obi_clean.h +../../../../../src/obi_ecopcr.c +../../../../../src/obi_ecopcr.h +../../../../../src/obi_ecotag.c +../../../../../src/obi_ecotag.h +../../../../../src/obidms_taxonomy.c +../../../../../src/obidms_taxonomy.h +../../../../../src/obilittlebigman.c +../../../../../src/obilittlebigman.h +../../../../../src/_sse.h +../../../../../src/obidebug.h +../../../../../src/libecoPCR/libapat/CODES/dft_code.h +../../../../../src/libecoPCR/libapat/CODES/dna_code.h +../../../../../src/libecoPCR/libapat/CODES/prot_code.h +../../../../../src/libecoPCR/libapat/apat_parse.c +../../../../../src/libecoPCR/libapat/apat_search.c +../../../../../src/libecoPCR/libapat/apat.h +../../../../../src/libecoPCR/libapat/Gmach.h +../../../../../src/libecoPCR/libapat/Gtypes.h +../../../../../src/libecoPCR/libapat/libstki.c +../../../../../src/libecoPCR/libapat/libstki.h +../../../../../src/libecoPCR/libthermo/nnparams.h +../../../../../src/libecoPCR/libthermo/nnparams.c +../../../../../src/libecoPCR/ecoapat.c +../../../../../src/libecoPCR/ecodna.c +../../../../../src/libecoPCR/ecoError.c +../../../../../src/libecoPCR/ecoMalloc.c +../../../../../src/libecoPCR/ecoPCR.h + + + + + + + diff --git a/python/obitools3/dms/column/typed_column/qual.pxd b/python/obitools3/dms/column/typed_column/qual.pxd index b0c0b47..3b8a20e 100755 --- a/python/obitools3/dms/column/typed_column/qual.pxd +++ b/python/obitools3/dms/column/typed_column/qual.pxd @@ -1,10 +1,10 @@ # #cython: language_level=3 -from obitools3.dms.capi.obitypes cimport index_t +from ...capi.obitypes cimport index_t -from obitools3.dms.column.column_idx cimport Column_idx, \ - Column_multi_elts_idx +from ..column_idx cimport Column_idx, \ + Column_multi_elts_idx cdef class Column_qual(Column_idx) : diff --git a/python/obitools3/dms/column/typed_column/qual.pyx b/python/obitools3/dms/column/typed_column/qual.pyx index f45ed88..7670f3a 100755 --- a/python/obitools3/dms/column/typed_column/qual.pyx +++ b/python/obitools3/dms/column/typed_column/qual.pyx @@ -1,21 +1,17 @@ #cython: language_level=3 -from obitools3.dms.capi.obitypes cimport index_t - -from obitools3.dms.column.column_idx cimport Column_idx, \ - Column_multi_elts_idx - from obitools3.dms.capi.obierrno cimport obi_errno -from obitools3.dms.view.view cimport View +from ..column cimport register_column_class -from obitools3.dms.column.column cimport Column, \ - register_column_class +from ...view.view cimport View + +from ..column cimport Column from obitools3.utils cimport tobytes, bytes2str, \ obi_errno_to_exception -from obitools3.dms.capi.obiview cimport obi_get_qual_char_with_elt_name_and_col_p_in_view, \ +from ...capi.obiview cimport obi_get_qual_char_with_elt_name_and_col_p_in_view, \ obi_get_qual_char_with_elt_idx_and_col_p_in_view, \ obi_set_qual_char_with_elt_name_and_col_p_in_view, \ obi_set_qual_char_with_elt_idx_and_col_p_in_view, \ @@ -25,9 +21,9 @@ from obitools3.dms.capi.obiview cimport obi_get_qual_char_with_elt_name_and_col_ obi_set_qual_int_with_elt_idx_and_col_p_in_view, \ Obiview_p -from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p +from ...capi.obidmscolumn cimport OBIDMS_column_p -from obitools3.dms.capi.obitypes cimport OBI_QUAL, OBIQual_char_NA, OBIQual_int_NA, const_char_p +from ...capi.obitypes cimport OBI_QUAL, OBIQual_char_NA, OBIQual_int_NA, const_char_p from libc.stdlib cimport malloc, free from libc.stdint cimport uint8_t diff --git a/python/obitools3/dms/column/typed_column/seq.cfiles b/python/obitools3/dms/column/typed_column/seq.cfiles new file mode 100644 index 0000000..72668a9 --- /dev/null +++ b/python/obitools3/dms/column/typed_column/seq.cfiles @@ -0,0 +1,110 @@ +../../../../../src/obi_lcs.h +../../../../../src/obi_lcs.c +../../../../../src/obierrno.h +../../../../../src/obierrno.c +../../../../../src/upperband.h +../../../../../src/upperband.c +../../../../../src/sse_banded_LCS_alignment.h +../../../../../src/sse_banded_LCS_alignment.c +../../../../../src/obiblob.h +../../../../../src/obiblob.c +../../../../../src/utils.h +../../../../../src/utils.c +../../../../../src/obidms.h +../../../../../src/obidms.c +../../../../../src/libjson/json_utils.h +../../../../../src/libjson/json_utils.c +../../../../../src/libjson/cJSON.h +../../../../../src/libjson/cJSON.c +../../../../../src/obiavl.h +../../../../../src/obiavl.c +../../../../../src/bloom.h +../../../../../src/bloom.c +../../../../../src/crc64.h +../../../../../src/crc64.c +../../../../../src/murmurhash2.h +../../../../../src/murmurhash2.c +../../../../../src/obidmscolumn.h +../../../../../src/obidmscolumn.c +../../../../../src/obitypes.h +../../../../../src/obitypes.c +../../../../../src/obidmscolumndir.h +../../../../../src/obidmscolumndir.c +../../../../../src/obiblob_indexer.h +../../../../../src/obiblob_indexer.c +../../../../../src/obiview.h +../../../../../src/obiview.c +../../../../../src/hashtable.h +../../../../../src/hashtable.c +../../../../../src/linked_list.h +../../../../../src/linked_list.c +../../../../../src/obidmscolumn_array.h +../../../../../src/obidmscolumn_array.c +../../../../../src/obidmscolumn_blob.h +../../../../../src/obidmscolumn_blob.c +../../../../../src/obidmscolumn_idx.h +../../../../../src/obidmscolumn_idx.c +../../../../../src/obidmscolumn_bool.h +../../../../../src/obidmscolumn_bool.c +../../../../../src/obidmscolumn_char.h +../../../../../src/obidmscolumn_char.c +../../../../../src/obidmscolumn_float.h +../../../../../src/obidmscolumn_float.c +../../../../../src/obidmscolumn_int.h +../../../../../src/obidmscolumn_int.c +../../../../../src/obidmscolumn_qual.h +../../../../../src/obidmscolumn_qual.c +../../../../../src/obidmscolumn_seq.h +../../../../../src/obidmscolumn_seq.c +../../../../../src/obidmscolumn_str.h +../../../../../src/obidmscolumn_str.c +../../../../../src/array_indexer.h +../../../../../src/array_indexer.c +../../../../../src/char_str_indexer.h +../../../../../src/char_str_indexer.c +../../../../../src/dna_seq_indexer.h +../../../../../src/dna_seq_indexer.c +../../../../../src/encode.c +../../../../../src/encode.h +../../../../../src/uint8_indexer.c +../../../../../src/uint8_indexer.h +../../../../../src/build_reference_db.c +../../../../../src/build_reference_db.h +../../../../../src/kmer_similarity.c +../../../../../src/kmer_similarity.h +../../../../../src/obi_clean.c +../../../../../src/obi_clean.h +../../../../../src/obi_ecopcr.c +../../../../../src/obi_ecopcr.h +../../../../../src/obi_ecotag.c +../../../../../src/obi_ecotag.h +../../../../../src/obidms_taxonomy.c +../../../../../src/obidms_taxonomy.h +../../../../../src/obilittlebigman.c +../../../../../src/obilittlebigman.h +../../../../../src/_sse.h +../../../../../src/obidebug.h +../../../../../src/libecoPCR/libapat/CODES/dft_code.h +../../../../../src/libecoPCR/libapat/CODES/dna_code.h +../../../../../src/libecoPCR/libapat/CODES/prot_code.h +../../../../../src/libecoPCR/libapat/apat_parse.c +../../../../../src/libecoPCR/libapat/apat_search.c +../../../../../src/libecoPCR/libapat/apat.h +../../../../../src/libecoPCR/libapat/Gmach.h +../../../../../src/libecoPCR/libapat/Gtypes.h +../../../../../src/libecoPCR/libapat/libstki.c +../../../../../src/libecoPCR/libapat/libstki.h +../../../../../src/libecoPCR/libthermo/nnparams.h +../../../../../src/libecoPCR/libthermo/nnparams.c +../../../../../src/libecoPCR/ecoapat.c +../../../../../src/libecoPCR/ecodna.c +../../../../../src/libecoPCR/ecoError.c +../../../../../src/libecoPCR/ecoMalloc.c +../../../../../src/libecoPCR/ecoPCR.h + + + + + + + diff --git a/python/obitools3/dms/column/typed_column/seq.pxd b/python/obitools3/dms/column/typed_column/seq.pxd index 7ccf985..fcab9af 100755 --- a/python/obitools3/dms/column/typed_column/seq.pxd +++ b/python/obitools3/dms/column/typed_column/seq.pxd @@ -1,9 +1,9 @@ # #cython: language_level=3 -from obitools3.dms.capi.obitypes cimport index_t +from ...capi.obitypes cimport index_t -from obitools3.dms.column.column_idx cimport Column_idx, \ +from ..column_idx cimport Column_idx, \ Column_multi_elts_idx diff --git a/python/obitools3/dms/column/typed_column/seq.pyx b/python/obitools3/dms/column/typed_column/seq.pyx index 6c0679b..e77e076 100755 --- a/python/obitools3/dms/column/typed_column/seq.pyx +++ b/python/obitools3/dms/column/typed_column/seq.pyx @@ -1,20 +1,17 @@ #cython: language_level=3 -from obitools3.dms.capi.obitypes cimport index_t - -from obitools3.dms.column.column_idx cimport Column_idx, \ - Column_multi_elts_idx - from obitools3.dms.capi.obierrno cimport obi_errno -from obitools3.dms.column.column cimport Column, register_column_class +from ..column cimport register_column_class -from obitools3.dms.view.view cimport View +from ...view.view cimport View + +from ..column cimport Column from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from obitools3.dms.capi.obiview cimport obi_get_seq_with_elt_name_and_col_p_in_view, \ +from ...capi.obiview cimport obi_get_seq_with_elt_name_and_col_p_in_view, \ obi_get_seq_with_elt_idx_and_col_p_in_view, \ obi_set_seq_with_elt_name_and_col_p_in_view, \ obi_set_seq_with_elt_idx_and_col_p_in_view, \ @@ -24,9 +21,9 @@ from obitools3.dms.capi.obiview cimport obi_get_seq_with_elt_name_and_col_p_in_v obi_set_array_with_col_p_in_view, \ Obiview_p -from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p +from ...capi.obidmscolumn cimport OBIDMS_column_p -from obitools3.dms.capi.obitypes cimport OBI_SEQ, \ +from ...capi.obitypes cimport OBI_SEQ, \ OBISeq_NA, \ OBITuple_NA diff --git a/python/obitools3/dms/column/typed_column/str.cfiles b/python/obitools3/dms/column/typed_column/str.cfiles new file mode 100644 index 0000000..72668a9 --- /dev/null +++ b/python/obitools3/dms/column/typed_column/str.cfiles @@ -0,0 +1,110 @@ +../../../../../src/obi_lcs.h +../../../../../src/obi_lcs.c +../../../../../src/obierrno.h +../../../../../src/obierrno.c +../../../../../src/upperband.h +../../../../../src/upperband.c +../../../../../src/sse_banded_LCS_alignment.h +../../../../../src/sse_banded_LCS_alignment.c +../../../../../src/obiblob.h +../../../../../src/obiblob.c +../../../../../src/utils.h +../../../../../src/utils.c +../../../../../src/obidms.h +../../../../../src/obidms.c +../../../../../src/libjson/json_utils.h +../../../../../src/libjson/json_utils.c +../../../../../src/libjson/cJSON.h +../../../../../src/libjson/cJSON.c +../../../../../src/obiavl.h +../../../../../src/obiavl.c +../../../../../src/bloom.h +../../../../../src/bloom.c +../../../../../src/crc64.h +../../../../../src/crc64.c +../../../../../src/murmurhash2.h +../../../../../src/murmurhash2.c +../../../../../src/obidmscolumn.h +../../../../../src/obidmscolumn.c +../../../../../src/obitypes.h +../../../../../src/obitypes.c +../../../../../src/obidmscolumndir.h +../../../../../src/obidmscolumndir.c +../../../../../src/obiblob_indexer.h +../../../../../src/obiblob_indexer.c +../../../../../src/obiview.h +../../../../../src/obiview.c +../../../../../src/hashtable.h +../../../../../src/hashtable.c +../../../../../src/linked_list.h +../../../../../src/linked_list.c +../../../../../src/obidmscolumn_array.h +../../../../../src/obidmscolumn_array.c +../../../../../src/obidmscolumn_blob.h +../../../../../src/obidmscolumn_blob.c +../../../../../src/obidmscolumn_idx.h +../../../../../src/obidmscolumn_idx.c +../../../../../src/obidmscolumn_bool.h +../../../../../src/obidmscolumn_bool.c +../../../../../src/obidmscolumn_char.h +../../../../../src/obidmscolumn_char.c +../../../../../src/obidmscolumn_float.h +../../../../../src/obidmscolumn_float.c +../../../../../src/obidmscolumn_int.h +../../../../../src/obidmscolumn_int.c +../../../../../src/obidmscolumn_qual.h +../../../../../src/obidmscolumn_qual.c +../../../../../src/obidmscolumn_seq.h +../../../../../src/obidmscolumn_seq.c +../../../../../src/obidmscolumn_str.h +../../../../../src/obidmscolumn_str.c +../../../../../src/array_indexer.h +../../../../../src/array_indexer.c +../../../../../src/char_str_indexer.h +../../../../../src/char_str_indexer.c +../../../../../src/dna_seq_indexer.h +../../../../../src/dna_seq_indexer.c +../../../../../src/encode.c +../../../../../src/encode.h +../../../../../src/uint8_indexer.c +../../../../../src/uint8_indexer.h +../../../../../src/build_reference_db.c +../../../../../src/build_reference_db.h +../../../../../src/kmer_similarity.c +../../../../../src/kmer_similarity.h +../../../../../src/obi_clean.c +../../../../../src/obi_clean.h +../../../../../src/obi_ecopcr.c +../../../../../src/obi_ecopcr.h +../../../../../src/obi_ecotag.c +../../../../../src/obi_ecotag.h +../../../../../src/obidms_taxonomy.c +../../../../../src/obidms_taxonomy.h +../../../../../src/obilittlebigman.c +../../../../../src/obilittlebigman.h +../../../../../src/_sse.h +../../../../../src/obidebug.h +../../../../../src/libecoPCR/libapat/CODES/dft_code.h +../../../../../src/libecoPCR/libapat/CODES/dna_code.h +../../../../../src/libecoPCR/libapat/CODES/prot_code.h +../../../../../src/libecoPCR/libapat/apat_parse.c +../../../../../src/libecoPCR/libapat/apat_search.c +../../../../../src/libecoPCR/libapat/apat.h +../../../../../src/libecoPCR/libapat/Gmach.h +../../../../../src/libecoPCR/libapat/Gtypes.h +../../../../../src/libecoPCR/libapat/libstki.c +../../../../../src/libecoPCR/libapat/libstki.h +../../../../../src/libecoPCR/libthermo/nnparams.h +../../../../../src/libecoPCR/libthermo/nnparams.c +../../../../../src/libecoPCR/ecoapat.c +../../../../../src/libecoPCR/ecodna.c +../../../../../src/libecoPCR/ecoError.c +../../../../../src/libecoPCR/ecoMalloc.c +../../../../../src/libecoPCR/ecoPCR.h + + + + + + + diff --git a/python/obitools3/dms/column/typed_column/str.pxd b/python/obitools3/dms/column/typed_column/str.pxd index 5bb75df..8f72b44 100755 --- a/python/obitools3/dms/column/typed_column/str.pxd +++ b/python/obitools3/dms/column/typed_column/str.pxd @@ -1,9 +1,9 @@ # #cython: language_level=3 -from obitools3.dms.capi.obitypes cimport index_t +from ...capi.obitypes cimport index_t -from obitools3.dms.column.column_idx cimport Column_idx, \ +from ..column_idx cimport Column_idx, \ Column_multi_elts_idx diff --git a/python/obitools3/dms/column/typed_column/str.pyx b/python/obitools3/dms/column/typed_column/str.pyx index 76e14a5..412d86b 100755 --- a/python/obitools3/dms/column/typed_column/str.pyx +++ b/python/obitools3/dms/column/typed_column/str.pyx @@ -1,34 +1,30 @@ #cython: language_level=3 -from obitools3.dms.capi.obitypes cimport index_t - -from obitools3.dms.column.column_idx cimport Column_idx, \ - Column_multi_elts_idx - - from obitools3.dms.capi.obierrno cimport obi_errno -from obitools3.dms.column.column cimport Column, register_column_class +from ..column cimport register_column_class -from obitools3.dms.view.view cimport View +from ...view.view cimport View + +from ..column cimport Column from obitools3.utils cimport tobytes, \ obi_errno_to_exception -from obitools3.dms.capi.obiview cimport obi_get_str_with_elt_name_and_col_p_in_view, \ - obi_get_str_with_elt_idx_and_col_p_in_view, \ - obi_set_str_with_elt_name_and_col_p_in_view, \ - obi_set_str_with_elt_idx_and_col_p_in_view, \ - obi_get_array_with_col_p_in_view, \ - obi_set_array_with_col_p_in_view, \ - Obiview_p +from ...capi.obiview cimport obi_get_str_with_elt_name_and_col_p_in_view, \ + obi_get_str_with_elt_idx_and_col_p_in_view, \ + obi_set_str_with_elt_name_and_col_p_in_view, \ + obi_set_str_with_elt_idx_and_col_p_in_view, \ + obi_get_array_with_col_p_in_view, \ + obi_set_array_with_col_p_in_view, \ + Obiview_p -from obitools3.dms.capi.obidmscolumn cimport OBIDMS_column_p +from ...capi.obidmscolumn cimport OBIDMS_column_p -from obitools3.dms.capi.obitypes cimport OBI_STR, \ - OBIStr_NA, \ - OBITuple_NA, \ - const_char_p +from ...capi.obitypes cimport OBI_STR, \ + OBIStr_NA, \ + OBITuple_NA, \ + const_char_p from libc.stdint cimport int32_t from libc.stdlib cimport calloc, free diff --git a/python/obitools3/dms/dms.pxd b/python/obitools3/dms/dms.pxd index 25e4319..6fc3068 100755 --- a/python/obitools3/dms/dms.pxd +++ b/python/obitools3/dms/dms.pxd @@ -1,8 +1,8 @@ #cython: language_level=3 -from obitools3.dms.object cimport OBIWrapper +from .object cimport OBIWrapper -from obitools3.dms.capi.obidms cimport OBIDMS_p +from .capi.obidms cimport OBIDMS_p cdef class DMS(OBIWrapper): diff --git a/python/obitools3/dms/taxo/taxo.pxd b/python/obitools3/dms/taxo/taxo.pxd index e885897..0e4cbd0 100755 --- a/python/obitools3/dms/taxo/taxo.pxd +++ b/python/obitools3/dms/taxo/taxo.pxd @@ -1,10 +1,10 @@ -# cython: language_level=3 +#cython: language_level=3 -from obitools3.dms.capi.obitaxonomy cimport ecotx_t, OBIDMS_taxonomy_p +from ..capi.obitaxonomy cimport ecotx_t, OBIDMS_taxonomy_p -from obitools3.dms.dms cimport DMS +from ..dms cimport DMS -from obitools3.dms.object cimport OBIWrapper +from ..object cimport OBIWrapper cdef class Taxonomy(OBIWrapper) : @@ -28,5 +28,4 @@ cdef class Taxonomy(OBIWrapper) : cdef class Taxon : cdef ecotx_t* _pointer - cdef Taxonomy _tax - \ No newline at end of file + cdef Taxonomy _tax \ No newline at end of file diff --git a/python/obitools3/dms/taxo/taxo.pyx b/python/obitools3/dms/taxo/taxo.pyx index 2ff403b..758b7ac 100755 --- a/python/obitools3/dms/taxo/taxo.pyx +++ b/python/obitools3/dms/taxo/taxo.pyx @@ -1,13 +1,8 @@ #cython: language_level=3 from obitools3.utils cimport str2bytes, bytes2str, tobytes, tostr -from obitools3.dms.capi.obitaxonomy cimport ecotx_t, OBIDMS_taxonomy_p -from obitools3.dms.dms cimport DMS - -from obitools3.dms.object cimport OBIWrapper - -from obitools3.dms.capi.obitaxonomy cimport obi_taxonomy_exists, \ +from ..capi.obitaxonomy cimport obi_taxonomy_exists, \ obi_read_taxonomy, \ obi_read_taxdump, \ obi_write_taxonomy, \ @@ -20,9 +15,7 @@ from obitools3.dms.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 @@ -227,11 +220,7 @@ cdef class Taxonomy(OBIWrapper) : cpdef write(self, object prefix) : - cdef DMS dms - cdef OBIDMS_p dms_p - dms = self._dms - dms_p = dms.pointer() - if obi_write_taxonomy(dms_p, self.pointer(), tobytes(prefix)) < 0 : + if obi_write_taxonomy(self._dms.pointer(), self.pointer(), tobytes(prefix)) < 0 : raise Exception("Error writing the taxonomy to binary files") @@ -320,7 +309,7 @@ cdef class Taxonomy(OBIWrapper) : cdef class Taxon : # TODO dict subclass? def __init__(self, object taxon_capsule, Taxonomy tax) : - self._pointer = PyCapsule_GetPointer(taxon_capsule, NULL) + self._pointer = PyCapsule_GetPointer(taxon_capsule, NULL) if self._pointer == NULL : raise Exception("Error reading a taxon (NULL pointer)") self._tax = tax diff --git a/python/obitools3/utils.pxd b/python/obitools3/utils.pxd index 443bc73..53d3765 100755 --- a/python/obitools3/utils.pxd +++ b/python/obitools3/utils.pxd @@ -1,4 +1,4 @@ -# cython: language_level=3 +#cython: language_level=3 from obitools3.dms.capi.obitypes cimport obitype_t, index_t diff --git a/python/obitools3/utils.pyx b/python/obitools3/utils.pyx index 4d0a946..d3a1526 100755 --- a/python/obitools3/utils.pyx +++ b/python/obitools3/utils.pyx @@ -1,5 +1,4 @@ -# cython: language_level=3 -# distutils: include_dirs = src +#cython: language_level=3 from obitools3.dms.capi.obitypes cimport is_a_DNA_seq, \ OBI_VOID, \ From 3a6d1be795d2bbb23b2cfe2d2ffc069ffdf30aa1 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 29 Mar 2019 15:42:45 +0100 Subject: [PATCH 11/14] remove the old distutils --- distutils.ext/obidistutils/__init__.py | 0 .../obidistutils/command/__init__.py | 0 distutils.ext/obidistutils/command/build.py | 38 --- .../obidistutils/command/build_cexe.py | 85 ------- .../obidistutils/command/build_ctools.py | 63 ----- .../obidistutils/command/build_exe.py | 228 ----------------- .../obidistutils/command/build_ext.py | 143 ----------- .../obidistutils/command/build_files.py | 63 ----- .../obidistutils/command/build_scripts.py | 104 -------- .../obidistutils/command/build_sphinx.py | 27 -- distutils.ext/obidistutils/command/install.py | 19 -- .../obidistutils/command/install_scripts.py | 47 ---- .../obidistutils/command/install_sphinx.py | 61 ----- .../obidistutils/command/littlebigman.py | 59 ----- distutils.ext/obidistutils/command/pidname.py | 55 ---- distutils.ext/obidistutils/command/sdist.py | 42 ---- distutils.ext/obidistutils/core.py | 234 ------------------ distutils.ext/obidistutils/dist.py | 58 ----- .../obidistutils/serenity/__init__.py | 118 --------- .../obidistutils/serenity/bootstrappip.py | 36 --- .../obidistutils/serenity/checkpackage.py | 175 ------------- .../obidistutils/serenity/checkpython.py | 138 ----------- .../obidistutils/serenity/checksystem.py | 18 -- .../obidistutils/serenity/globals.py | 14 -- distutils.ext/obidistutils/serenity/rerun.py | 61 ----- distutils.ext/obidistutils/serenity/snake.py | 35 --- distutils.ext/obidistutils/serenity/util.py | 27 -- .../obidistutils/serenity/virtual.py | 69 ------ distutils.ext/src/littlebigman.c | 24 -- distutils.ext/src/pidname.c | 24 -- 30 files changed, 2065 deletions(-) delete mode 100644 distutils.ext/obidistutils/__init__.py delete mode 100644 distutils.ext/obidistutils/command/__init__.py delete mode 100644 distutils.ext/obidistutils/command/build.py delete mode 100644 distutils.ext/obidistutils/command/build_cexe.py delete mode 100644 distutils.ext/obidistutils/command/build_ctools.py delete mode 100644 distutils.ext/obidistutils/command/build_exe.py delete mode 100644 distutils.ext/obidistutils/command/build_ext.py delete mode 100644 distutils.ext/obidistutils/command/build_files.py delete mode 100644 distutils.ext/obidistutils/command/build_scripts.py delete mode 100644 distutils.ext/obidistutils/command/build_sphinx.py delete mode 100644 distutils.ext/obidistutils/command/install.py delete mode 100644 distutils.ext/obidistutils/command/install_scripts.py delete mode 100644 distutils.ext/obidistutils/command/install_sphinx.py delete mode 100644 distutils.ext/obidistutils/command/littlebigman.py delete mode 100644 distutils.ext/obidistutils/command/pidname.py delete mode 100644 distutils.ext/obidistutils/command/sdist.py delete mode 100644 distutils.ext/obidistutils/core.py delete mode 100644 distutils.ext/obidistutils/dist.py delete mode 100644 distutils.ext/obidistutils/serenity/__init__.py delete mode 100644 distutils.ext/obidistutils/serenity/bootstrappip.py delete mode 100644 distutils.ext/obidistutils/serenity/checkpackage.py delete mode 100644 distutils.ext/obidistutils/serenity/checkpython.py delete mode 100644 distutils.ext/obidistutils/serenity/checksystem.py delete mode 100644 distutils.ext/obidistutils/serenity/globals.py delete mode 100644 distutils.ext/obidistutils/serenity/rerun.py delete mode 100644 distutils.ext/obidistutils/serenity/snake.py delete mode 100644 distutils.ext/obidistutils/serenity/util.py delete mode 100644 distutils.ext/obidistutils/serenity/virtual.py delete mode 100644 distutils.ext/src/littlebigman.c delete mode 100644 distutils.ext/src/pidname.c diff --git a/distutils.ext/obidistutils/__init__.py b/distutils.ext/obidistutils/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/distutils.ext/obidistutils/command/__init__.py b/distutils.ext/obidistutils/command/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/distutils.ext/obidistutils/command/build.py b/distutils.ext/obidistutils/command/build.py deleted file mode 100644 index 7434afd..0000000 --- a/distutils.ext/obidistutils/command/build.py +++ /dev/null @@ -1,38 +0,0 @@ -''' -Created on 20 oct. 2012 - -@author: coissac -''' - -from distutils.command.build import build as ori_build -from obidistutils.serenity.checksystem import is_mac_system - - -class build(ori_build): - - def has_ext_modules(self): - return self.distribution.has_ext_modules() - - def has_pidname(self): - return is_mac_system() - - def has_doc(self): - return True - - def has_littlebigman(self): - return True - - try: - from obidistutils.command.build_sphinx import build_sphinx # @UnusedImport - - sub_commands = [("littlebigman",has_littlebigman), - ('pidname',has_pidname) - ] \ - + ori_build.sub_commands + \ - [('build_sphinx',has_doc)] - except ImportError: - sub_commands = [("littlebigman",has_littlebigman), - ('pidname',has_pidname) - ] \ - + ori_build.sub_commands - diff --git a/distutils.ext/obidistutils/command/build_cexe.py b/distutils.ext/obidistutils/command/build_cexe.py deleted file mode 100644 index b3907f1..0000000 --- a/distutils.ext/obidistutils/command/build_cexe.py +++ /dev/null @@ -1,85 +0,0 @@ -''' -Created on 20 oct. 2012 - -@author: coissac -''' - -from .build_ctools import build_ctools -from .build_exe import build_exe -from distutils.errors import DistutilsSetupError -from distutils import log -import os - -class build_cexe(build_ctools): - - description = "build C/C++ executable distributed with Python extensions" - - - def initialize_options(self): - build_ctools.initialize_options(self) - self.built_files = None - - - def finalize_options(self): - # This might be confusing: both build-cexe and build-temp default - # to build-temp as defined by the "build" command. This is because - # I think that C libraries are really just temporary build - # by-products, at least from the point of view of building Python - # extensions -- but I want to keep my options open. - - build_cexe_dir = self.build_cexe - build_ctools.finalize_options(self) - - if build_cexe_dir is None: - self.build_cexe=None - - self.set_undefined_options('build', - ('build_scripts', 'build_cexe')) - - self.set_undefined_options('build_files', - ('files', 'built_files')) - - self.executables = self.distribution.executables -# self.build_cexe = os.path.join(os.path.dirname(self.build_cexe),'cbinaries') -# self.mkpath(self.build_cexe) - - if self.executables: - self.check_executable_list(self.executables) - - - # XXX same as for build_ext -- what about 'self.define' and - # 'self.undef' ? - - def substitute_sources(self,exe_name,sources): - """ - Substitutes source file name starting by an @ by the actual - name of the built file (see --> build_files) - """ - sources = list(sources) - for i in range(len(sources)): - message = "%s :-> %s" % (exe_name,sources[i]) - if sources[i][0]=='@': - try: - filename = self.built_files[sources[i][1:]] - except KeyError: - raise DistutilsSetupError( - 'The %s filename declared in the source ' - 'files of the program %s have not been ' - 'built by the installation process' % (sources[i], - exe_name)) - sources[i]=filename - log.info("%s changed to %s",message,filename) - else: - log.info("%s ok",message) - - return sources - - def run(self): - - for cmd_name in self.get_sub_commands(): - self.run_command(cmd_name) - - build_exe.run(self) - - - diff --git a/distutils.ext/obidistutils/command/build_ctools.py b/distutils.ext/obidistutils/command/build_ctools.py deleted file mode 100644 index 38996be..0000000 --- a/distutils.ext/obidistutils/command/build_ctools.py +++ /dev/null @@ -1,63 +0,0 @@ -''' -Created on 20 oct. 2012 - -@author: coissac -''' - - -from .build_exe import build_exe -from distutils import log - -class build_ctools(build_exe): - description = "build C/C++ executable not distributed with Python extensions" - - def initialize_options(self): - build_exe.initialize_options(self) - - # List of built tools - self.ctools = None - self.littlebigman = None - - - def finalize_options(self): - # This might be confusing: both build-cexe and build-temp default - # to build-temp as defined by the "build" command. This is because - # I think that C libraries are really just temporary build - # by-products, at least from the point of view of building Python - # extensions -- but I want to keep my options open. - - build_exe.finalize_options(self) - - - self.set_undefined_options('build', - ('build_temp', 'build_cexe')) - - self.set_undefined_options('littlebigman', - ('littlebigman', 'littlebigman')) - - self.executables = self.distribution.ctools - self.check_executable_list(self.executables) - - - if self.littlebigman =='-DLITTLE_END': - if self.define is None: - self.define=[('LITTLE_END',None)] - else: - self.define.append('LITTLE_END',None) - - log.info('Look for CPU architecture... %s',self.define) - - self.ctools = set() - - def run(self): - - for cmd_name in self.get_sub_commands(): - self.run_command(cmd_name) - - - build_exe.run(self) - - for e,p in self.executables: # @UnusedVariable - self.ctools.add(e) - - diff --git a/distutils.ext/obidistutils/command/build_exe.py b/distutils.ext/obidistutils/command/build_exe.py deleted file mode 100644 index 0ec6b11..0000000 --- a/distutils.ext/obidistutils/command/build_exe.py +++ /dev/null @@ -1,228 +0,0 @@ -''' -Created on 20 oct. 2012 - -@author: coissac -''' - -import os - -from distutils import sysconfig -from distutils.core import Command -from distutils.sysconfig import customize_compiler as customize_compiler_ori -from distutils.errors import DistutilsSetupError -from distutils import log -from distutils.ccompiler import show_compilers - -def customize_compiler(compiler): - customize_compiler_ori(compiler) - compilername = compiler.compiler[0] - if ("gcc" in compilername or "g++" in compilername): - cc_cmd = ' '.join(compiler.compiler + ['-fopenmp']) - ccshared= ' '.join(x for x in sysconfig.get_config_vars("ccshared") if x is not None) - - compiler.set_executables( - compiler=cc_cmd, - compiler_so=cc_cmd + ' ' + ccshared - ) - - - - -class build_exe(Command): - - description = "build an executable -- Abstract command " - - user_options = [ - ('build-cexe', 'x', - "directory to build C/C++ libraries to"), - ('build-temp', 't', - "directory to put temporary build by-products"), - ('debug', 'g', - "compile with debugging information"), - ('force', 'f', - "forcibly build everything (ignore file timestamps)"), - ('compiler=', 'c', - "specify the compiler type"), - ] - - boolean_options = ['debug', 'force'] - - help_options = [ - ('help-compiler', None, - "list available compilers", show_compilers), - ] - - def initialize_options(self): - self.build_cexe = None - self.build_temp = None - - # List of executables to build - self.executables = None - - # Compilation options for all libraries - self.include_dirs = None - self.define = None - self.undef = None - self.extra_compile_args = None - self.debug = None - self.force = 0 - self.compiler = None - self.sse = None - self.built_files=None - - def finalize_options(self): - # This might be confusing: both build-cexe and build-temp default - # to build-temp as defined by the "build" command. This is because - # I think that C libraries are really just temporary build - # by-products, at least from the point of view of building Python - # extensions -- but I want to keep my options open. - self.set_undefined_options('build', - ('build_temp', 'build_temp'), - ('compiler', 'compiler'), - ('debug', 'debug'), - ('force', 'force')) - - if self.include_dirs is None: - self.include_dirs = self.distribution.include_dirs or [] - - if isinstance(self.include_dirs, str): - self.include_dirs = self.include_dirs.split(os.pathsep) - - self.sse = self.distribution.sse - - if self.sse is not None: - if self.extra_compile_args is None: - self.extra_compile_args=['-m%s' % self.sse] - else: - self.extra_compile_args.append('-m%s' % self.sse) - - - # XXX same as for build_ext -- what about 'self.define' and - # 'self.undef' ? - - def run(self): - - if not self.executables: - return - - self.mkpath(self.build_cexe) - - # Yech -- this is cut 'n pasted from build_ext.py! - from distutils.ccompiler import new_compiler - self.compiler = new_compiler(compiler=self.compiler, - dry_run=self.dry_run, - force=self.force) - customize_compiler(self.compiler) - - if self.include_dirs is not None: - self.compiler.set_include_dirs(self.include_dirs) - if self.define is not None: - # 'define' option is a list of (name,value) tuples - for (name,value) in self.define: - self.compiler.define_macro(name, value) - - if self.undef is not None: - for macro in self.undef: - self.compiler.undefine_macro(macro) - - self.build_executables(self.executables) - - - def check_executable_list(self, executables): - """Ensure that the list of executables is valid. - - `executable` is presumably provided as a command option 'executables'. - This method checks that it is a list of 2-tuples, where the tuples - are (executable_name, build_info_dict). - - Raise DistutilsSetupError if the structure is invalid anywhere; - just returns otherwise. - """ - if not isinstance(executables, list): - raise DistutilsSetupError("'executables' option must be a list of tuples") - - for exe in executables: - if not isinstance(exe, tuple) and len(exe) != 2: - raise DistutilsSetupError("each element of 'executables' must a 2-tuple") - - name, build_info = exe - - if not isinstance(name, str): - raise DistutilsSetupError( - "first element of each tuple in 'executables' " - "must be a string (the executables name)") - - if '/' in name or (os.sep != '/' and os.sep in name): - raise DistutilsSetupError( - "bad executable name '%s': " - "may not contain directory separators" % exe[0]) - - if not isinstance(build_info, dict): - raise DistutilsSetupError( - "second element of each tuple in 'executables' " - "must be a dictionary (build info)") - - def get_executable_names(self): - # Assume the executables list is valid -- 'check_executable_list()' is - # called from 'finalize_options()', so it should be! - if not self.executables: - return None - - exe_names = [] - for (exe_name, build_info) in self.executables: # @UnusedVariable - exe_names.append(exe_name) - return exe_names - - - def get_source_files(self): - self.check_executable_list(self.executables) - filenames = [] - for (exe_name, build_info) in self.executables: # @UnusedVariable - sources = build_info.get('sources') - if sources is None or not isinstance(sources, (list, tuple)): - raise DistutilsSetupError( - "in 'executables' option (library '%s'), " - "'sources' must be present and must be " - "a list of source filenames" % exe_name) - - filenames.extend(sources) - return filenames - - def substitute_sources(self,exe_name,sources): - return list(sources) - - def build_executables(self, executables): - for (exe_name, build_info) in executables: - sources = build_info.get('sources') - if sources is None or not isinstance(sources, (list, tuple)): - raise DistutilsSetupError( - "in 'executables' option (library '%s'), " - "'sources' must be present and must be " - "a list of source filenames" % exe_name) - - sources = self.substitute_sources(exe_name,sources) - - log.info("building '%s' program", exe_name) - - # First, compile the source code to object files in the library - # directory. (This should probably change to putting object - # files in a temporary build directory.) - macros = build_info.get('macros') - include_dirs = build_info.get('include_dirs') - extra_args = self.extra_compile_args or [] - - objects = self.compiler.compile(sources, - output_dir=self.build_temp, - macros=macros, - include_dirs=include_dirs, - extra_postargs=extra_args, - debug=self.debug) - - # Now "link" the object files together into a static library. - # (On Unix at least, this isn't really linking -- it just - # builds an archive. Whatever.) - self.compiler.link_executable(objects, exe_name, - output_dir=self.build_cexe, - debug=self.debug) - - diff --git a/distutils.ext/obidistutils/command/build_ext.py b/distutils.ext/obidistutils/command/build_ext.py deleted file mode 100644 index 8d00634..0000000 --- a/distutils.ext/obidistutils/command/build_ext.py +++ /dev/null @@ -1,143 +0,0 @@ -''' -Created on 13 fevr. 2014 - -@author: coissac -''' - -from distutils import log -import os - -from distutils import sysconfig -from distutils.errors import DistutilsSetupError - -def _customize_compiler(compiler): - compilername = compiler.compiler[0] - if ("gcc" in compilername or "g++" in compilername): - cc_cmd = ' '.join(compiler.compiler + ['-fopenmp']) - ccshared= ' '.join(x for x in sysconfig.get_config_vars("ccshared") if x is not None) - - compiler.set_executables( - compiler=cc_cmd, - compiler_so=cc_cmd + ' ' + ccshared - ) - - -try: - from Cython.Distutils import build_ext as ori_build_ext # @UnresolvedImport - from Cython.Compiler import Options as cython_options # @UnresolvedImport - class build_ext(ori_build_ext): - - - def modifyDocScripts(self): - try: - os.mkdir("doc/sphinx") - except: - pass - build_dir_file=open("doc/sphinx/build_dir.txt","w") - print(self.build_lib,file=build_dir_file) - build_dir_file.close() - - def initialize_options(self): - ori_build_ext.initialize_options(self) # @UndefinedVariable - self.littlebigman = None - self.built_files = None - - - def finalize_options(self): - super(build_ext, self).finalize_options() - - - self.set_undefined_options('littlebigman', - ('littlebigman', 'littlebigman')) - - self.set_undefined_options('build_files', - ('files', 'built_files')) - - self.cython_c_in_temp = 1 - - if self.littlebigman =='-DLITTLE_END': - if self.define is None: - self.define=[('LITTLE_END',None)] - else: - self.define.append('LITTLE_END',None) - - def substitute_sources(self,exe_name,sources): - """ - Substitutes source file name starting by an @ by the actual - name of the built file (see --> build_files) - """ - sources = list(sources) - for i in range(len(sources)): - message = "%s :-> %s" % (exe_name,sources[i]) - if sources[i][0]=='@': - try: - filename = self.built_files[sources[i][1:]] - except KeyError: - tmpfilename = os.path.join(self.build_temp,sources[i][1:]) - if os.path.isfile (tmpfilename): - filename = tmpfilename - else: - raise DistutilsSetupError( - 'The %s filename declared in the source ' - 'files of the program %s have not been ' - 'built by the installation process' % (sources[i], - exe_name)) - sources[i]=filename - log.info("%s changed to %s",message,filename) - else: - log.info("%s ok",message) - - return sources - - def build_extensions(self): - # First, sanity-check the 'extensions' list - - for ext in self.extensions: - ext.sources = self.substitute_sources(ext.name,ext.sources) - - self.check_extensions_list(self.extensions) - - print("pouic") - print(ext.sources) - print("pouac") - - for ext in self.extensions: - log.info("%s :-> %s",ext.name,ext.sources) - ext.sources = self.cython_sources(ext.sources, ext) - self.build_extension(ext) - - def build_extensions(self): # TODO what?? double? is it supposed to be build_extension? - if hasattr(self, 'compiler'): - _customize_compiler(self.compiler) - if hasattr(self, 'shlib_compiler'): - _customize_compiler(self.shlib_compiler) - - ori_build_ext.build_extensions(self) - - - def run(self): - self.modifyDocScripts() - - for cmd_name in self.get_sub_commands(): - self.run_command(cmd_name) - - cython_options.annotate = True - ori_build_ext.run(self) # @UndefinedVariable - - - def has_files(self): - return self.distribution.has_files() - - def has_executables(self): - return self.distribution.has_executables() - - sub_commands = [('build_files',has_files), - ('build_cexe', has_executables) - ] + ori_build_ext.sub_commands - -except ImportError: - from distutils.command import build_ext # @UnusedImport - - - - \ No newline at end of file diff --git a/distutils.ext/obidistutils/command/build_files.py b/distutils.ext/obidistutils/command/build_files.py deleted file mode 100644 index 656b5a8..0000000 --- a/distutils.ext/obidistutils/command/build_files.py +++ /dev/null @@ -1,63 +0,0 @@ -''' -Created on 20 oct. 2012 - -@author: coissac -''' - -import os.path - -from distutils.core import Command -from distutils import log - -class build_files(Command): - - def initialize_options(self): - self.files=None - self.ctools=None - self.build_temp=None - self.build_cexe=None - - def finalize_options(self): - - self.set_undefined_options('build_ctools', - ('ctools', 'ctools'), - ('build_temp','build_temp'), - ('build_cexe','build_cexe'), - ) - - self.files = {} - - def run(self): - - for cmd_name in self.get_sub_commands(): - self.run_command(cmd_name) - - - for dest,prog,command in self.distribution.files: - destfile = os.path.join(self.build_temp,dest) - if prog in self.ctools: - progfile = os.path.join(self.build_cexe,prog) - else: - progfile = prog - - log.info("Building file : %s" % dest) - - commandline = command % {'prog' : progfile, - 'dest' : destfile} - - log.info(" --> %s" % commandline) - - os.system(commandline) - self.files[dest]=destfile - - log.info("Done.\n") - - def has_ctools(self): - return self.distribution.has_ctools() - - - sub_commands = [('build_ctools', has_ctools)] + \ - Command.sub_commands - - - diff --git a/distutils.ext/obidistutils/command/build_scripts.py b/distutils.ext/obidistutils/command/build_scripts.py deleted file mode 100644 index 0d0fa43..0000000 --- a/distutils.ext/obidistutils/command/build_scripts.py +++ /dev/null @@ -1,104 +0,0 @@ -''' -Created on 20 oct. 2012 - -@author: coissac -''' - -import os.path - -from distutils.command.build_scripts import build_scripts as ori_build_scripts -from distutils.util import convert_path -from distutils import log, sysconfig -from distutils.dep_util import newer -from stat import ST_MODE -import re - -first_line_re = re.compile('^#!.*python[0-9.]*([ \t].*)?$') - -class build_scripts(ori_build_scripts): - - def copy_scripts (self): - """Copy each script listed in 'self.scripts'; if it's marked as a - Python script in the Unix way (first line matches 'first_line_re', - ie. starts with "\#!" and contains "python"), then adjust the first - line to refer to the current Python interpreter as we copy. - """ - self.mkpath(self.build_dir) - rawbuild_dir = os.path.join(os.path.dirname(self.build_dir),'raw_scripts') - self.mkpath(rawbuild_dir) - - outfiles = [] - for script in self.scripts: - adjust = 0 - script = convert_path(script) - outfile = os.path.join(self.build_dir, os.path.splitext(os.path.basename(script))[0]) - rawoutfile = os.path.join(rawbuild_dir, os.path.basename(script)) - outfiles.append(outfile) - - if not self.force and not newer(script, outfile): - log.debug("not copying %s (up-to-date)", script) - continue - - # Always open the file but ignore failures in dry-run mode -- - # that way, we'll get accurate feedback if we can read the - # script. - try: - f = open(script, "r") - except IOError: - if not self.dry_run: - raise - f = None - else: - first_line = f.readline() - if not first_line: - self.warn("%s is an empty file (skipping)" % script) - continue - - match = first_line_re.match(first_line) - if match: - adjust = 1 - post_interp = match.group(1) or '' - - log.info("Store the raw script %s -> %s", script,rawoutfile) - self.copy_file(script, rawoutfile) - - - if adjust: - log.info("copying and adjusting %s -> %s", script, - self.build_dir) - if not self.dry_run: - outf = open(outfile, "w") - if not sysconfig.python_build: - outf.write("#!%s%s\n" % - (self.executable, - post_interp)) - else: - outf.write("#!%s%s\n" % - (os.path.join( - sysconfig.get_config_var("BINDIR"), - "python%s%s" % (sysconfig.get_config_var("VERSION"), - sysconfig.get_config_var("EXE"))), - post_interp)) - outf.writelines(f.readlines()) - outf.close() - if f: - f.close() - else: - if f: - f.close() - self.copy_file(script, outfile) - - if os.name == 'posix': - for F in outfiles: - if self.dry_run: - log.info("changing mode of %s", F) - else: - oldmode = os.stat(F)[ST_MODE] - oldmode = oldmode & 0o7777 - - newmode = (oldmode | 0o555) & 0o7777 - if newmode != oldmode: - log.info("changing mode of %s from %o to %o", - F, oldmode, newmode) - os.chmod(F, newmode) - diff --git a/distutils.ext/obidistutils/command/build_sphinx.py b/distutils.ext/obidistutils/command/build_sphinx.py deleted file mode 100644 index e349083..0000000 --- a/distutils.ext/obidistutils/command/build_sphinx.py +++ /dev/null @@ -1,27 +0,0 @@ -''' -Created on 10 mars 2015 - -@author: coissac -''' - -try: - from sphinx.setup_command import BuildDoc as ori_build_sphinx # @UnresolvedImport - - class build_sphinx(ori_build_sphinx): - '''Build Sphinx documentation in html, epub and man formats - ''' - - description = __doc__ - - def run(self): - self.builder='html' - self.finalize_options() - ori_build_sphinx.run(self) - self.builder='epub' - self.finalize_options() - ori_build_sphinx.run(self) - self.builder='man' - self.finalize_options() - ori_build_sphinx.run(self) -except ImportError: - pass \ No newline at end of file diff --git a/distutils.ext/obidistutils/command/install.py b/distutils.ext/obidistutils/command/install.py deleted file mode 100644 index 1befe1a..0000000 --- a/distutils.ext/obidistutils/command/install.py +++ /dev/null @@ -1,19 +0,0 @@ -''' -Created on 6 oct. 2014 - -@author: coissac -''' - -# try: -# from setuptools.command.install import install as install_ori -# except ImportError: -# from distutils.command.install import install as install_ori - -from distutils.command.install import install as install_ori - -class install(install_ori): - - def __init__(self,dist): - install_ori.__init__(self, dist) -# self.sub_commands.insert(0, ('build',lambda self: True)) - self.sub_commands.append(('install_sphinx',lambda self: self.distribution.serenity)) diff --git a/distutils.ext/obidistutils/command/install_scripts.py b/distutils.ext/obidistutils/command/install_scripts.py deleted file mode 100644 index 0a91ffd..0000000 --- a/distutils.ext/obidistutils/command/install_scripts.py +++ /dev/null @@ -1,47 +0,0 @@ -''' -Created on 20 oct. 2012 - -@author: coissac -''' - -# try: -# from setuptools.command.install_scripts import install_scripts as ori_install_scripts -# except ImportError: -# from distutils.command.install_scripts import install_scripts as ori_install_scripts - -from distutils.command.install_scripts import install_scripts as ori_install_scripts - -import os.path -from distutils import log - -class install_scripts(ori_install_scripts): - - def initialize_options(self): - ori_install_scripts.initialize_options(self) - self.public_dir = None - - - def install_public_link(self): - self.mkpath(self.public_dir) - for file in self.get_outputs(): - log.info("exporting file %s -> %s", file,os.path.join(self.public_dir, - os.path.split(file)[1] - )) - if not self.dry_run: - dest = os.path.join(self.public_dir, - os.path.split(file)[1] - ) - if os.path.exists(dest): - os.unlink(dest) - os.symlink(file,dest) - - - - def run(self): - ori_install_scripts.run(self) - if self.distribution.serenity: - self.public_dir=os.path.join(self.install_dir,"../export/bin") - self.public_dir=os.path.abspath(self.public_dir) - self.install_public_link() - - diff --git a/distutils.ext/obidistutils/command/install_sphinx.py b/distutils.ext/obidistutils/command/install_sphinx.py deleted file mode 100644 index 96549d8..0000000 --- a/distutils.ext/obidistutils/command/install_sphinx.py +++ /dev/null @@ -1,61 +0,0 @@ -''' -Created on 10 mars 2015 - -@author: coissac -''' -from distutils.core import Command -import os.path -import glob - -class install_sphinx(Command): - ''' - Install the sphinx documentation - ''' - - description = "Install the sphinx documentation in serenity mode" - - boolean_options = ['force', 'skip-build'] - - - def initialize_options (self): - self.install_doc = None - self.build_dir = None - - def finalize_options (self): - self.set_undefined_options('build_sphinx', ('build_dir', 'build_dir')) - self.set_undefined_options('install', - ('install_scripts', 'install_doc')) - - def run (self): - if self.distribution.serenity: - self.install_doc = os.path.join(self.install_doc,"../export/share") - self.install_doc=os.path.abspath(self.install_doc) - self.mkpath(self.install_doc) - self.mkpath(os.path.join(self.install_doc,'html')) - outfiles = self.copy_tree(os.path.join(self.build_dir,'html'), # @UnusedVariable - os.path.join(self.install_doc,'html')) - - self.mkpath(os.path.join(self.install_doc,'man','man1')) - outfiles = self.copy_tree(os.path.join(self.build_dir,'man'), # @UnusedVariable - os.path.join(self.install_doc,'man','man1')) - - for epub in glob.glob(os.path.join(self.build_dir,'epub/*.epub')): - self.copy_file(os.path.join(epub), - os.path.join(self.install_doc,os.path.split(epub)[1])) - - def get_outputs(self): - directory=os.path.join(self.install_doc,'html') - files = [os.path.join(self.install_doc,'html', f) - for dp, dn, filenames in os.walk(directory) for f in filenames] # @UnusedVariable - - directory=os.path.join(self.build_dir,'man') - files.append(os.path.join(self.install_doc,'man','man1', f) - for dp, dn, filenames in os.walk(directory) for f in filenames) # @UnusedVariable - - directory=os.path.join(self.build_dir,'epub') - files.append(os.path.join(self.install_doc, f) - for dp, dn, filenames in os.walk(directory) # @UnusedVariable - for f in glob.glob(os.path.join(dp, '*.epub')) ) - - return files - \ No newline at end of file diff --git a/distutils.ext/obidistutils/command/littlebigman.py b/distutils.ext/obidistutils/command/littlebigman.py deleted file mode 100644 index 65f2dad..0000000 --- a/distutils.ext/obidistutils/command/littlebigman.py +++ /dev/null @@ -1,59 +0,0 @@ -''' -Created on 20 oct. 2012 - -@author: coissac -''' - -import os - -from obidistutils.command.build_exe import build_exe -from distutils import log - -import subprocess - -class littlebigman(build_exe): - - description = "build the littlebigman executable testing endianness of the CPU" - - - def initialize_options(self): - build_exe.initialize_options(self) - - self.littlebigman = None - - - def finalize_options(self): - # This might be confusing: both build-cexe and build-temp default - # to build-temp as defined by the "build" command. This is because - # I think that C libraries are really just temporary build - # by-products, at least from the point of view of building Python - # extensions -- but I want to keep my options open. - - build_exe.finalize_options(self) - - self.set_undefined_options('build', - ('build_temp', 'build_cexe')) - - # self.ctools = self.distribution.ctools - - if os.path.isfile("distutils.ext/src/littlebigman.c"): - self.executables = [('littlebigman',{"sources":["distutils.ext/src/littlebigman.c"]})] - self.check_executable_list(self.executables) - else: - self.executables = [] - - - def run_littlebigman(self): - p = subprocess.Popen("'%s'" % os.path.join(self.build_temp, - 'littlebigman'), - shell=True, - stdout=subprocess.PIPE) - little = p.communicate()[0] - return little.decode('latin1') - - def run(self): - build_exe.run(self) - self.littlebigman=self.run_littlebigman() - log.info("Your CPU is in mode : %s" % self.littlebigman) - - \ No newline at end of file diff --git a/distutils.ext/obidistutils/command/pidname.py b/distutils.ext/obidistutils/command/pidname.py deleted file mode 100644 index 871e1ab..0000000 --- a/distutils.ext/obidistutils/command/pidname.py +++ /dev/null @@ -1,55 +0,0 @@ -''' -Created on 20 oct. 2012 - -@author: coissac -''' - -import os - -from obidistutils.command.build_exe import build_exe -from obidistutils.serenity.checksystem import is_mac_system - - -class pidname(build_exe): - - description = "build the pidname executable returning the executable path from a PID on a mac" - - - def initialize_options(self): - build_exe.initialize_options(self) - - self.pidname = False - - - def finalize_options(self): - # This might be confusing: both build-cexe and build-temp default - # to build-temp as defined by the "build" command. This is because - # I think that C libraries are really just temporary build - # by-products, at least from the point of view of building Python - # extensions -- but I want to keep my options open. - - build_exe.finalize_options(self) - - self.set_undefined_options('build', - ('build_scripts', 'build_cexe')) - - # self.ctools = self.distribution.ctools - - if os.path.isfile("distutils.ext/src/pidname.c"): - self.executables = [('pidname',{"sources":["distutils.ext/src/pidname.c"]})] - self.check_executable_list(self.executables) - else: - self.executables = [] - -# self.build_cexe = os.path.join(os.path.dirname(self.build_cexe),'cbinaries') -# self.mkpath(self.build_cexe) - - - - def run(self): - if is_mac_system(): - build_exe.run(self) - self.pidname=True - else: - self.pidname=False - \ No newline at end of file diff --git a/distutils.ext/obidistutils/command/sdist.py b/distutils.ext/obidistutils/command/sdist.py deleted file mode 100644 index 9293c86..0000000 --- a/distutils.ext/obidistutils/command/sdist.py +++ /dev/null @@ -1,42 +0,0 @@ -''' -Created on 10 mars 2015 - -@author: coissac -''' - -import os.path - -from distutils.command.sdist import sdist as orig_sdist -from distutils import dir_util - -class sdist(orig_sdist): - - def make_distribution(self): - """Create the source distribution(s). First, we create the release - tree with 'make_release_tree()'; then, we create all required - archive files (according to 'self.formats') from the release tree. - Finally, we clean up by blowing away the release tree (unless - 'self.keep_temp' is true). The list of archive files created is - stored so it can be retrieved later by 'get_archive_files()'. - """ - # Don't warn about missing meta-data here -- should be (and is!) - # done elsewhere. - base_dir = self.distribution.get_fullname() - base_name = os.path.join(self.dist_dir,base_dir) - - self.make_release_tree(os.path.join('tmp',base_dir), self.filelist.files) - archive_files = [] # remember names of files we create - # tar archive must be created last to avoid overwrite and remove - if 'tar' in self.formats: - self.formats.append(self.formats.pop(self.formats.index('tar'))) - - for fmt in self.formats: - file = self.make_archive(base_name, fmt, root_dir='tmp',base_dir=base_dir, - owner=self.owner, group=self.group) - archive_files.append(file) - self.distribution.dist_files.append(('sdist', '', file)) - - self.archive_files = archive_files - - if not self.keep_temp: - dir_util.remove_tree(os.path.join('tmp',base_dir), dry_run=self.dry_run) diff --git a/distutils.ext/obidistutils/core.py b/distutils.ext/obidistutils/core.py deleted file mode 100644 index ea1c08c..0000000 --- a/distutils.ext/obidistutils/core.py +++ /dev/null @@ -1,234 +0,0 @@ -''' -Created on 20 oct. 2012 - -@author: coissac -''' - -from os import path -import os.path -import glob -import sys - -try: - from setuptools.extension import Extension -except ImportError: - from distutils.extension import Extension - -# from distutils.extension import Extension - -from obidistutils.serenity.checkpackage import install_requirements,\ - check_requirements, \ - RequirementError - -from obidistutils.serenity.rerun import enforce_good_python -from obidistutils.serenity.rerun import rerun_with_anothe_python -from distutils import log - -from obidistutils.dist import Distribution -from obidistutils.serenity import is_serenity - - -def findPackage(root,base=None): - modules=[] - if base is None: - base=[] - for module in (path.basename(path.dirname(x)) - for x in glob.glob(path.join(root,'*','__init__.py'))): - modules.append('.'.join(base+[module])) - modules.extend(findPackage(path.join(root,module),base+[module])) - return modules - -def findCython(root,base=None,pyrexs=None): - setupdir = os.path.dirname(sys.argv[0]) - pyrexs=[] - - if base is None: - base=[] - for module in (path.basename(path.dirname(x)) - for x in glob.glob(path.join(root,'*','__init__.py'))): - - for pyrex in glob.glob(path.join(root,module,'*.pyx')): - libabspath = os.path.abspath('obi_libdir') - obiabspath = os.path.abspath('.') - pyrexs.append(Extension('.'.join(base+[module,path.splitext(path.basename(pyrex))[0]]), - [pyrex], - library_dirs=[libabspath], - include_dirs=[libabspath], - libraries=["obi3"], - runtime_library_dirs=[libabspath], - extra_link_args=["-Wl,-rpath,"+libabspath, "-L"+libabspath] - ) - ) - try: - cfiles = os.path.splitext(pyrex)[0]+".cfiles" - cfilesdir = os.path.dirname(cfiles) - cfiles = open(cfiles) - cfiles = [os.path.relpath(os.path.join(cfilesdir,y),setupdir).strip() - if y[0] !='@' else y.strip() - for y in cfiles] - - log.info("Cython module : %s",cfiles) - incdir = set(os.path.dirname(x) for x in cfiles if x[-2:]==".h") - #cfiles = [x for x in cfiles if x[-2:]==".c"] - #pyrexs[-1].sources.extend(cfiles) - pyrexs[-1].include_dirs.extend(incdir) - pyrexs[-1].extra_compile_args.extend(['-msse2', - '-Wno-unused-function', - '-Wmissing-braces', - '-Wchar-subscripts', - '-fPIC' - ]) - - except IOError: - pass - - pyrexs.extend(findCython(path.join(root,module),base+[module])) - return pyrexs - - -def rootname(x): - return os.path.splitext(x.sources[0])[0] - - -def prepare_commands(): - from obidistutils.command.build import build - from obidistutils.command.littlebigman import littlebigman -# from obidistutils.command.serenity import serenity - from obidistutils.command.build_cexe import build_cexe - from obidistutils.command.build_ext import build_ext - from obidistutils.command.build_ctools import build_ctools - from obidistutils.command.build_files import build_files - from obidistutils.command.build_scripts import build_scripts - from obidistutils.command.install_scripts import install_scripts - from obidistutils.command.install_sphinx import install_sphinx - from obidistutils.command.install import install - from obidistutils.command.pidname import pidname - from obidistutils.command.sdist import sdist - - - - COMMANDS = {'build':build, -# 'serenity':serenity, - 'littlebigman':littlebigman, - 'pidname':pidname, - 'build_ctools':build_ctools, - 'build_files':build_files, - 'build_cexe':build_cexe, - 'build_ext': build_ext, - 'build_scripts':build_scripts, - 'install_scripts':install_scripts, - 'install_sphinx':install_sphinx, - 'install':install, - 'sdist':sdist} - -# try: -# from setuptools.commands import egg_info -# COMMANDS['egg_info']=egg_info -# except ImportError: -# pass - try: - from obidistutils.command.build_sphinx import build_sphinx - COMMANDS['build_sphinx']=build_sphinx - except ImportError: - pass - - return COMMANDS - - -CTOOLS =[] -CEXES =[] -FILES =[] - -def setup(**attrs): - - log.set_threshold(log.INFO) - - minversion = attrs.get("pythonmin",'3.7') - maxversion = attrs.get('pythonmax',None) - fork = attrs.get('fork',False) - requirementfile = attrs.get('requirements','requirements.txt') - - try: - del attrs['pythonmin'] - except KeyError: - pass - - try: - del attrs['pythonmax'] - except KeyError: - pass - - try: - del attrs['fork'] - except KeyError: - pass - - try: - del attrs['requirements'] - except KeyError: - pass - - if is_serenity(): - - - enforce_good_python(minversion, maxversion, fork) - - if (install_requirements(requirementfile)): - rerun_with_anothe_python(sys.executable,minversion,maxversion,fork) - - - try: - check_requirements(requirementfile) - except RequirementError as e : - log.error(e) - sys.exit(1) - - if 'distclass' not in attrs: - attrs['distclass']=Distribution - - if 'python_src' not in attrs: - SRC = 'python' - else: - SRC = attrs['python_src'] - del(attrs['python_src']) - - if 'scripts' not in attrs: - attrs['scripts'] = glob.glob('%s/*.py' % SRC) - - if 'package_dir' not in attrs: - attrs['package_dir'] = {'': SRC} - - if 'packages' not in attrs: - attrs['packages'] = findPackage(SRC) - - if 'cmdclass' not in attrs: - attrs['cmdclass'] = prepare_commands() - - if 'ctools' not in attrs: - attrs['ctools'] = CTOOLS - - if 'executables' not in attrs: - attrs['executables'] = CEXES - - if 'files' not in attrs: - attrs['files'] = FILES - - if 'sse' not in attrs: - attrs['sse']=None - - if 'serenity' not in attrs: - attrs['serenity']=False - - EXTENTION=findCython(SRC) - - if 'ext_modules' not in attrs: - attrs['ext_modules'] = EXTENTION - -# try: -# from setuptools.core import setup as ori_setup -# except ImportError: -# from distutils.core import setup as ori_setup - - from distutils.core import setup as ori_setup - - return ori_setup(**attrs) diff --git a/distutils.ext/obidistutils/dist.py b/distutils.ext/obidistutils/dist.py deleted file mode 100644 index 8cbbffb..0000000 --- a/distutils.ext/obidistutils/dist.py +++ /dev/null @@ -1,58 +0,0 @@ -''' -Created on 20 oct. 2012 - -@author: coissac -''' - -try: - from setuptools.dist import Distribution as ori_Distribution -except ImportError: - from distutils.dist import Distribution as ori_Distribution - -# from distutils.dist import Distribution as ori_Distribution - -class Distribution(ori_Distribution): - - def __init__(self,attrs=None): - self.executables = None - self.ctools = None - self.files = None - self.build_cexe = None - self.deprecated_scripts = None - self.zip_safe=False - self.sse = None - self.serenity=attrs['serenity'] - - ori_Distribution.__init__(self, attrs) - - self.global_options.insert(0,('serenity', None, "install or build the package in a python virtualenv " - "without polluting the installed python and with many " - "checks during the installation process" - )) - self.global_options.insert(0,('virtualenv', None, "if the installation is done using the serenity mode " - "this option allows for specifying the virtualenv name. " - "By default the name is PACKAGE-VERSION" - )) - - def run_commands(self): - """Run each command that was seen on the setup script command line. - Uses the list of commands found and cache of command objects - created by 'get_command_obj()'. - """ -# self.run_command('littlebigman') - ori_Distribution.run_commands(self) - - - def has_executables(self): - return self.executables is not None and self.executables - - def has_ctools(self): - return self.ctools is not None and self.ctools - - def has_files(self): - return self.files is not None and self.files - - def has_deprecated_scripts(self): - return self.deprecated_scripts is not None and self.deprecated_scripts - - \ No newline at end of file diff --git a/distutils.ext/obidistutils/serenity/__init__.py b/distutils.ext/obidistutils/serenity/__init__.py deleted file mode 100644 index 38f3591..0000000 --- a/distutils.ext/obidistutils/serenity/__init__.py +++ /dev/null @@ -1,118 +0,0 @@ -import sys - -from distutils import util -from distutils import sysconfig -from distutils import log -from distutils.version import LooseVersion, StrictVersion -import glob -import os -import subprocess -import re -from distutils.errors import DistutilsError -import tempfile - -from importlib.util import spec_from_file_location # @UnresolvedImport -import zipimport - -import argparse - -import base64 - -from .checkpython import is_python_version - - -from obidistutils.serenity.rerun import enforce_good_python -from obidistutils.serenity.rerun import rerun_with_anothe_python - -from obidistutils.serenity.virtual import serenity_virtualenv - -from obidistutils.serenity.checksystem import is_mac_system, \ - is_windows_system - -from obidistutils.serenity.checkpackage import install_requirements -from obidistutils.serenity.checkpackage import check_requirements - -from obidistutils.serenity.util import save_argv - -from obidistutils.serenity.snake import snake - - -def serenity_snake(envname,package,version): - old = log.set_threshold(log.INFO) - - log.info("Installing %s (%s) in serenity mode" % (package,version)) - - enforce_good_python() - - virtualpython=serenity_virtualenv(envname,package,version) - - if virtualpython!=os.path.realpath(sys.executable): - log.info("Restarting installation within the %s virtualenv" % (envname)) - rerun_with_anothe_python(virtualpython) - - log.info("%s will be installed with python : %s" % (package,virtualpython)) - - if install_requirements(): - log.info("Restarting installation with all dependencies ok") - rerun_with_anothe_python(virtualpython) - - log.set_threshold(old) - -def serenity_assert(version): - check_requirements() - - -def is_serenity(): - from obidistutils.serenity.globals import local_serenity - return local_serenity and local_serenity[0] - -def serenity_mode(package,version): - - save_argv() - - - from obidistutils.serenity.globals import saved_args - from obidistutils.serenity.globals import local_serenity - - - old = log.set_threshold(log.INFO) - - argparser = argparse.ArgumentParser(add_help=False) - argparser.add_argument('--serenity', - dest='serenity', - action='store_true', - default=True, - help='Switch the installer in serenity mode. Everythings are installed in a virtualenv') - - argparser.add_argument('--no-serenity', - dest='serenity', - action='store_false', - default=True, - help='Switch the installer in the no serenity mode.') - - argparser.add_argument('--virtualenv', - dest='virtual', - type=str, - action='store', - default="%s-%s" % (package,version), - help='Specify the name of the virtualenv used by the serenity mode [default: %s-%s]' % (package,version)) - - args, unknown = argparser.parse_known_args() - sys.argv = [sys.argv[0]] + unknown - - if args.serenity: - local_serenity.append(True) - serenity_snake(args.virtual,package,version) - else: - local_serenity.append(False) - - log.set_threshold(old) - - return args.serenity - - -def getVersion(source,main,version): - path = os.path.join(source,main,'%s.py' % version) - spec = spec_from_file_location('version',path) - return spec.loader.load_module().version.strip() - diff --git a/distutils.ext/obidistutils/serenity/bootstrappip.py b/distutils.ext/obidistutils/serenity/bootstrappip.py deleted file mode 100644 index 01aebdf..0000000 --- a/distutils.ext/obidistutils/serenity/bootstrappip.py +++ /dev/null @@ -1,36 +0,0 @@ -''' -Created on 22 janv. 2016 - -@author: coissac -''' - -import sys -from urllib import request -import os.path - -from obidistutils.serenity.util import get_serenity_dir -from obidistutils.serenity.rerun import rerun_with_anothe_python -from obidistutils.serenity.checkpython import is_a_virtualenv_python - -getpipurl="https://bootstrap.pypa.io/get-pip.py" - -def bootstrap(): - - getpipfile=os.path.join(get_serenity_dir(),"get-pip.py") - - with request.urlopen(getpipurl) as getpip: - with open(getpipfile,"wb") as out: - for l in getpip: - out.write(l) - - python = sys.executable - - if is_a_virtualenv_python(): - command= "%s %s" % (python,getpipfile) - else: - command= "%s %s --user" % (python,getpipfile) - - os.system(command) - - rerun_with_anothe_python(python) - \ No newline at end of file diff --git a/distutils.ext/obidistutils/serenity/checkpackage.py b/distutils.ext/obidistutils/serenity/checkpackage.py deleted file mode 100644 index 31fc0c6..0000000 --- a/distutils.ext/obidistutils/serenity/checkpackage.py +++ /dev/null @@ -1,175 +0,0 @@ -''' -Created on 2 oct. 2014 - -@author: coissac -''' - -import re - -from distutils.version import StrictVersion # @UnusedImport -from distutils.errors import DistutilsError -from distutils import log - -import os.path -import sys -import subprocess - - -class RequirementError(Exception): - pass - -def is_installed(requirement): - pipcommand = os.path.join(os.path.dirname(sys.executable),'pip') - pipjson = subprocess.run([pipcommand,"list","--format=json"], - capture_output=True).stdout - packages = eval(pipjson) - - - - requirement_project,requirement_relation,requirement_version = parse_package_requirement(requirement) - - package = [x for x in packages if x["name"]==requirement_project] - - if len(package)==1: - if ( requirement_version is not None - and requirement_relation is not None): - rep = (len(package)==1) and eval("StrictVersion('%s') %s StrictVersion('%s')" % (package[0]["version"], - requirement_relation, - requirement_version) - ) - else: - rep=True - else: - rep=False - - if rep: - if requirement_version is not None and requirement_relation is not None: - log.info("Look for package %s (%s%s) : ok version %s installed" % (requirement_project, - requirement_relation, - requirement_version, - package[0]["version"])) - else: - log.info("Look for package %s : ok version %s installed" % (requirement_project, - package[0]["version"])) - else: - if len(package)!=1: - if requirement_version is not None and requirement_relation is not None: - log.info("Look for package %s (%s%s) : not installed" % (requirement_project, - requirement_relation, - requirement_version)) - else: - log.info("Look for package %s : not installed" % requirement_project) - else: - log.info("Look for package %s (%s%s) : failed only version %s installed" % (requirement_project, - requirement_relation, - requirement_version, - package[0]["version"])) - - return rep - - -def get_requirements(requirementfile='requirements.txt'): - - try: - requirements = open(requirementfile).readlines() - requirements = [x.strip() for x in requirements] - requirements = [x for x in requirements if x[0]!='-'] - - except IOError: - requirements = [] - - return requirements - - -def install_requirements(requirementfile='requirements.txt'): - - install_something=False - - requirements = get_requirements(requirementfile) - - log.info("Required packages for the installation :") - for x in requirements: - ok = is_installed(x) - if not ok: - log.info(" Installing requirement : %s" % x) - pip_install_package(x,requirement=requirementfile) - install_something=True - if x[0:3]=='pip': - return True - - return install_something - - -def check_requirements(requirementfile='requirements.txt'): - - requirements = get_requirements(requirementfile) - - log.info("Required packages for the installation :") - for x in requirements: - ok = is_installed(x) - if not ok: - raise RequirementError(" Missing requirement : %s -- Package installation stopped" % x) - - - - -def parse_package_requirement(requirement): - - version_pattern = re.compile('[=><]+(.*)$') - project_pattern = re.compile('[^=><]+') - relationship_pattern = re.compile('[=><]+') - - try: - requirement_project = project_pattern.search(requirement).group(0) - requirement_version = version_pattern.search(requirement) - if requirement_version is not None: - requirement_version=requirement_version.group(1) - requirement_relation= relationship_pattern.search(requirement) - if requirement_relation is not None: - requirement_relation=requirement_relation.group(0) - except: - raise DistutilsError("Requirement : %s not correctly formated" % requirement) - - return requirement_project,requirement_relation,requirement_version - - -def get_package_requirement(package,requirementfile='requirements.txt'): - requirements = get_requirements(requirementfile) - req = [x for x in requirements - if x[0:len(package)]==package - ] - - if len(req)==1: - return req[0] - else: - return None - - -def pip_install_package(package,directory=None,requirement=None): - - pipcommand = os.path.join(os.path.dirname(sys.executable),'pip') - if directory is not None: - log.info(' installing %s in directory %s' % (package,str(directory))) - - - if 'http_proxy' in os.environ and 'https_proxy' not in os.environ: - os.environ['https_proxy']=os.environ['http_proxy'] - - args = ['install'] - - if requirement: - args.append('--requirement') - args.append(requirement) - - if 'https_proxy' in os.environ: - args.append('--proxy=%s' % os.environ['https_proxy']) - - if directory is not None: - args.append('--target=%s' % directory) - - args.append(package) - - pip = subprocess.run([pipcommand] + args) - - return pip - diff --git a/distutils.ext/obidistutils/serenity/checkpython.py b/distutils.ext/obidistutils/serenity/checkpython.py deleted file mode 100644 index 7b6e057..0000000 --- a/distutils.ext/obidistutils/serenity/checkpython.py +++ /dev/null @@ -1,138 +0,0 @@ -''' -Created on 24 mai 2015 - -@author: coissac -''' -from distutils.version import StrictVersion -from distutils import sysconfig -import subprocess -import os -import glob -import re - -from obidistutils.serenity.checksystem import is_windows_system -import sys - - -def is_python_version(path=None,minversion='3.4',maxversion=None): - ''' - Checks that the python version is in the range {minversion,maxversion[ - - @param path: if None consider the running python - otherwise the python pointed by the path - @param minversion: the minimum version to consider - @param maxversion: the maximum version to consider (strictly inferior to) - - @return: True if the python version match - @rtype: bool - ''' - if path is None: - pythonversion = StrictVersion(sysconfig.get_python_version()) - else: - command = """'%s' -c 'from distutils import sysconfig; """ \ - """print(sysconfig.get_python_version())'""" % path - - p = subprocess.Popen(command, - shell=True, - stdout=subprocess.PIPE) - pythonversion=str(p.communicate()[0],'utf8').strip() - pythonversion = StrictVersion(pythonversion) - - return ( pythonversion >=StrictVersion(minversion) - and ( maxversion is None - or pythonversion < StrictVersion(maxversion)) - ) - - -def lookfor_good_python(minversion='3.4',maxversion=None,followLink=False): - ''' - Look for all python interpreters present in the system path that - match the version constraints. - - @param minversion: the minimum version to consider - @param maxversion: the maximum version to consider (strictly inferior to) - @param followLink: a boolean value indicating if link must be substituted - by their real path. - - @return: a list of path to interpreters - ''' - exe = [] - if not is_windows_system(): - paths = os.environ['PATH'].split(os.pathsep) - for p in paths: - candidates = glob.glob(os.path.join(p,'python*')) - pexe = [] - pythonpat=re.compile('python([0-9]|[0-9]\.[0-9])?$') - for e in candidates: - print(e) - if pythonpat.search(e) is not None: - if followLink and os.path.islink(e): - e = os.path.realpath(e) - if (os.path.isfile(e) and - os.access(e, os.X_OK) and - is_python_version(e,minversion,maxversion)): - pexe.append(e) - exe.extend(set(pexe)) - - return exe - -def is_a_virtualenv_python(path=None): - ''' - Check if the python is belonging a virtualenv - - @param path: the path pointing to the python executable. - if path is None then the running python is - considered. - @param path: str or None - - @return: True if the python belongs a virtualenv - False otherwise - @rtype: bool - - ''' - if path is None: - rep = sys.base_exec_prefix != sys.exec_prefix - else: - command = """'%s' -c 'import sys; print(sys.base_exec_prefix != sys.exec_prefix)'""" % path - p = subprocess.Popen(command, - shell=True, - stdout=subprocess.PIPE) - rep = eval(str(p.communicate()[0],'utf8')) - - return rep - - -def which_virtualenv(path=None,full=False): - ''' - Returns the name of the virtualenv. - @param path: the path to a python binary or None - if you want to consider the running python - @type path: str or None - - @param full: if set to True, returns the absolute path, - otherwise only return a simple directory name - @type full: bool - - @return: the virtual environment name or None if the - path does not belong a virtualenv - @rtype: str or None - ''' - if path is None: - path = sys.executable - - if is_a_virtualenv_python(path): - parts = path.split(os.sep) - try: - if full: - rep = os.sep.join(parts[0:parts.index('bin')]) - rep = os.path.realpath(rep) - else: - rep = parts[parts.index('bin')-1] - except ValueError: - rep = None - else: - rep=None - - return rep - - diff --git a/distutils.ext/obidistutils/serenity/checksystem.py b/distutils.ext/obidistutils/serenity/checksystem.py deleted file mode 100644 index 511ffca..0000000 --- a/distutils.ext/obidistutils/serenity/checksystem.py +++ /dev/null @@ -1,18 +0,0 @@ -''' -Created on 24 mai 2015 - -@author: coissac -''' - -from distutils import util - -def is_mac_system(): - platform = util.get_platform().split('-')[0] - - return platform=='macosx' - -def is_windows_system(): - platform = util.get_platform().split('-')[0] - - return platform=='Windows' - \ No newline at end of file diff --git a/distutils.ext/obidistutils/serenity/globals.py b/distutils.ext/obidistutils/serenity/globals.py deleted file mode 100644 index 0185b8b..0000000 --- a/distutils.ext/obidistutils/serenity/globals.py +++ /dev/null @@ -1,14 +0,0 @@ -''' -Created on 24 mai 2015 - -@author: coissac -''' - - -saved_args=[] -tmpdir=[] -local_pip=[] -local_virtualenv=[] -local_cython=[] -local_serenity=[] - \ No newline at end of file diff --git a/distutils.ext/obidistutils/serenity/rerun.py b/distutils.ext/obidistutils/serenity/rerun.py deleted file mode 100644 index 7a295f8..0000000 --- a/distutils.ext/obidistutils/serenity/rerun.py +++ /dev/null @@ -1,61 +0,0 @@ -''' -Created on 24 mai 2015 - -@author: coissac -''' - -import sys -import os -from distutils import log -from distutils.errors import DistutilsError - - -from obidistutils.serenity.globals import saved_args -from obidistutils.serenity.checkpython import is_python_version,\ - lookfor_good_python - - -def rerun_with_anothe_python(path, minversion='3.4',maxversion=None, fork=False): - - if saved_args: - args = saved_args - else: - args = list(sys.argv) - - - assert is_python_version(path,minversion,maxversion), \ - 'the selected python is not adapted to the installation of this package' - - args.insert(0, path) - - sys.stderr.flush() - sys.stdout.flush() - - if fork: - log.info('Forking a new install process') - os.system(' '.join(list(args))) - log.info('External process ended') - sys.exit(0) - else: - log.info('Install script restarting...') - os.execv(path,list(args)) - -def enforce_good_python(minversion='3.4',maxversion=None, fork=False): - if is_python_version(minversion=minversion,maxversion=maxversion): - log.info('You are running the good python') - return True - - goodpython = lookfor_good_python(minversion,maxversion) - - if not goodpython: - raise DistutilsError('No good python identified on your system') - - goodpython=goodpython[0] - - log.warn("========================================") - log.warn("") - log.warn(" Switching to python : %s" % goodpython) - log.warn("") - log.warn("========================================") - - rerun_with_anothe_python(goodpython) diff --git a/distutils.ext/obidistutils/serenity/snake.py b/distutils.ext/obidistutils/serenity/snake.py deleted file mode 100644 index 79c1f39..0000000 --- a/distutils.ext/obidistutils/serenity/snake.py +++ /dev/null @@ -1,35 +0,0 @@ -''' -Created on 2 oct. 2014 - -@author: coissac -''' - -snake =""" - - ___ - ,'._,`. - (-.___.-) - (-.___.-) - `-.___.-' - (( @ @| . __ - \ ` | ,\ |`. @| | | _.-._ - __`.`=-=mm===mm:: | | |`. | | | ,'=` '=`. - ( `-'|:/ /:/ `/ @| | | |, @| @| /---)W(---\ - \ \ / / / / @| | ' (----| |----) ,~ - |\ \ / /| / / @| \---| |---/ | - | \ V /||/ / `.-| |-,' | - | `-' |V / \| |/ @' - | , |-' __| |__ - | .;: _,-. ,--""..| |..""--. - ;;:::' " ) (`--::__|_|__::--') - ,-" _, / \`--...___...--'/ - ( -:--'/ / /`--...___...--'\ - "-._ `"'._/ /`---...___...---'\ - "-._ "---. (`---....___....---') - .' ",._ ,' ) |`---....___....---'| - /`._| `| | (`---....___....---') - ( \ | / \`---...___...---'/ - `. `, ^"" `:--...___...--;' - `.,' hh `-._______.-' - -""" \ No newline at end of file diff --git a/distutils.ext/obidistutils/serenity/util.py b/distutils.ext/obidistutils/serenity/util.py deleted file mode 100644 index 14c0283..0000000 --- a/distutils.ext/obidistutils/serenity/util.py +++ /dev/null @@ -1,27 +0,0 @@ -''' -Created on 2 oct. 2014 - -@author: coissac -''' - -import sys -import tempfile - - -from obidistutils.serenity.globals import tmpdir # @UnusedImport -from obidistutils.serenity.globals import saved_args # @UnusedImport - -def get_serenity_dir(): - global tmpdir - - if not tmpdir: - tmpdir.append(tempfile.mkdtemp()) - return tmpdir[0] - -def save_argv(): - global saved_args - - del saved_args[:] - saved_args.extend(list(sys.argv)) - - diff --git a/distutils.ext/obidistutils/serenity/virtual.py b/distutils.ext/obidistutils/serenity/virtual.py deleted file mode 100644 index 27ee67c..0000000 --- a/distutils.ext/obidistutils/serenity/virtual.py +++ /dev/null @@ -1,69 +0,0 @@ -''' -Created on 2 oct. 2014 - -@author: coissac -''' - -import os -import sys -import venv - -from distutils.errors import DistutilsError -from .globals import local_virtualenv # @UnusedImport -from .checkpython import which_virtualenv,\ - is_python_version, \ - is_a_virtualenv_python - - - - -def serenity_virtualenv(envname,package,version,minversion='3.4',maxversion=None): - - # - # Checks if we are already running under the good virtualenv - # - ve = which_virtualenv(full=True) - if ve == os.path.realpath(envname) and is_python_version(minversion=minversion,maxversion=maxversion): - return sys.executable - - # - # Check if the virtualenv exist - # - - python = None - - if os.path.isdir(envname): - python = os.path.join(envname,'bin','python') - ok = (is_python_version(python, - minversion=minversion, - maxversion=maxversion) and - is_a_virtualenv_python(python)) - - - # - # The virtualenv already exist but it is not ok - # - if not ok: - raise DistutilsError("A virtualenv %s already exists but not with the required python") - - else: - ok = False - - - # - # Creates a new virtualenv - # - if not ok: - venv.create(envname, - system_site_packages=False, - clear=True, - symlinks=False, - with_pip=True) - - # check the newly created virtualenv - return serenity_virtualenv(envname,package,version) - - return os.path.realpath(python) - - - \ No newline at end of file diff --git a/distutils.ext/src/littlebigman.c b/distutils.ext/src/littlebigman.c deleted file mode 100644 index 370bcaf..0000000 --- a/distutils.ext/src/littlebigman.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * littlebigman.c - * - * Created on: 11 juil. 2012 - * Author: coissac - */ - -#include - -int main(int argc, char *argv[]) -{ - union { int entier; - char caractere[4] ; - } test; - - test.entier=0x01020304; - - if (test.caractere[3] == 1) - printf("-DLITTLE_END"); - else - printf("-DBIG_END"); - - return 0; -} diff --git a/distutils.ext/src/pidname.c b/distutils.ext/src/pidname.c deleted file mode 100644 index ff61eb4..0000000 --- a/distutils.ext/src/pidname.c +++ /dev/null @@ -1,24 +0,0 @@ -#include -#include -#include -#include -#include - -int main (int argc, char* argv[]) -{ - pid_t pid; int ret; - char pathbuf[PROC_PIDPATHINFO_MAXSIZE]; - - if ( argc > 1 ) { - pid = (pid_t) atoi(argv[1]); - ret = proc_pidpath (pid, pathbuf, sizeof(pathbuf)); - if ( ret <= 0 ) { - fprintf(stderr, "PID %d: proc_pidpath ();\n", pid); - fprintf(stderr, " %s\n", strerror(errno)); - } else { - printf("proc %d: %s\n", pid, pathbuf); - } - } - - return 0; -} From 9c41b1e9da96aebaf839b9719dad21b35e0dd18f Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 29 Mar 2019 15:45:38 +0100 Subject: [PATCH 12/14] Move and rename the obi.py script --- python/obi.py => scripts/obi | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename python/obi.py => scripts/obi (100%) diff --git a/python/obi.py b/scripts/obi similarity index 100% rename from python/obi.py rename to scripts/obi From bf62960ee8c053c8726f638dcfe19b0c5f24cd7d Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 29 Mar 2019 15:52:54 +0100 Subject: [PATCH 13/14] Add some .ignore files --- .gitignore | 13 +++++++++++++ .project | 17 +++++++++++++++++ .pydevproject | 20 ++++++++++++++++++++ doc/sphinx/.gitignore | 2 ++ python/.gitignore | 1 + src/.gitignore | 5 +++++ 6 files changed, 58 insertions(+) create mode 100644 .gitignore create mode 100644 .project create mode 100644 .pydevproject create mode 100644 doc/sphinx/.gitignore create mode 100644 python/.gitignore create mode 100644 src/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b43e50f --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +.DS_Store +/obitools.test/ +/OBITools3- 1.01.16/ +/OBITools3-0.00.0/ +/build/ +/testpip/ +/toto.obidms/ +/unittests/ +/setup.py.old +/3_Hornung_testseq.fastq +/sample/ +/save.temp/ +/obitmp/ diff --git a/.project b/.project new file mode 100644 index 0000000..d1235be --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + obitools3 + + + + + + org.python.pydev.PyDevBuilder + + + + + + org.python.pydev.pythonNature + + diff --git a/.pydevproject b/.pydevproject new file mode 100644 index 0000000..c934917 --- /dev/null +++ b/.pydevproject @@ -0,0 +1,20 @@ + + + + + python3.6-obitool3 + + + python interpreter + + + + + + /${PROJECT_DIR_NAME}/python + + + + + + diff --git a/doc/sphinx/.gitignore b/doc/sphinx/.gitignore new file mode 100644 index 0000000..ebae2eb --- /dev/null +++ b/doc/sphinx/.gitignore @@ -0,0 +1,2 @@ +.DS_Store +/build_dir.txt diff --git a/python/.gitignore b/python/.gitignore new file mode 100644 index 0000000..4617832 --- /dev/null +++ b/python/.gitignore @@ -0,0 +1 @@ +/OBITools3.egg-info/ diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 0000000..1296339 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,5 @@ +/CMakeFiles/ +/CMakeCache.txt +/cmake_install.cmake +/libcobitools3.dylib +/Makefile From 27744222246fc9bc33e1091f6106386ac12ea011 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 29 Mar 2019 16:21:28 +0100 Subject: [PATCH 14/14] Patch the way of installing the obi main command --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 023ac7c..6384c06 100755 --- a/setup.py +++ b/setup.py @@ -11,11 +11,11 @@ from Cython.Build import cythonize import os.path from distutils import log from distutils.extension import Extension -from pip._internal.cli.cmdoptions import build_dir sys.path.append(os.path.abspath("python")) -print(sys.path) +dependencies = ['sphinx',"Cython"] + def findPackage(root,base=None): modules=[] @@ -120,6 +120,6 @@ setup(name=PACKAGE, ext_modules=xx, packages = findPackage('python'), package_dir = {"" : "python"}, - scripts = ['python/obi.py'] + scripts = ['scripts/obi'] )