update python versions, remove dependency on (stale) bundled src library

* respin debian patch * add endian fix from upstream PR Origin1: https://salsa.debian.org/python-team/packages/python-datrie/-/tree/master/debian/patches Origin2: upstream, pytries#85 Signed-off-by: Stephen L Arnold <nerdboy@gentoo.org>
freepn · Nov 16, 2020 · afa9620 · afa9620
1 parent c111d84
commit afa9620
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 22 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -4,12 +4,10 @@ include COPYING
 include tox.ini
 include tox-bench.ini
 include update_c.sh
-recursive-include libdatrie *.h
-recursive-include libdatrie *.c
 include tests/words100k.txt.zip
 recursive-include tests *.py
 
 include src/datrie.pyx
 include src/cdatrie.pxd
 include src/stdio_ext.pxd
-exclude src/datrie.c
+exclude src/datrie.c
diff --git a/libdatrie b/libdatrie
diff --git a/setup.py b/setup.py
@@ -7,9 +7,7 @@
 from setuptools import setup, Extension
 
 from Cython.Build import cythonize
-
-LIBDATRIE_DIR = 'libdatrie'
-LIBDATRIE_FILES = sorted(glob.glob(os.path.join(LIBDATRIE_DIR, "datrie", "*.c")))
+from Cython.Build.Dependencies import default_create_extension
 
 DESCRIPTION = __doc__
 LONG_DESCRIPTION = open('README.rst').read() + open('CHANGES.rst').read()
@@ -30,22 +28,26 @@
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: Implementation :: CPython',
     'Topic :: Software Development :: Libraries :: Python Modules',
     'Topic :: Scientific/Engineering :: Information Analysis',
     'Topic :: Text Processing :: Linguistic'
 ]
 
+def do_create_extension(template, kwds):
+    libs = kwds.get('libraries', []) + ["datrie"]
+    kwds['libraries'] = libs
+    return default_create_extension(template, kwds)
+
 ext_modules = cythonize(
     'src/datrie.pyx', 'src/cdatrie.pxd', 'src/stdio_ext.pxd',
     annotate=True,
     include_path=[os.path.join(os.path.dirname(os.path.abspath(__file__)), "src")],
-    language_level=2
+    language_level=2,
+    create_extension=do_create_extension
     )
 
-for m in ext_modules:
-    m.include_dirs=[LIBDATRIE_DIR]
-
 setup(name="datrie",
       version="0.8.2",
       description=DESCRIPTION,
@@ -55,10 +57,7 @@
       license=LICENSE,
       url='https://github.com/kmike/datrie',
       classifiers=CLASSIFIERS,
-      libraries=[('datrie', {
-          "sources": LIBDATRIE_FILES,
-          "include_dirs": [LIBDATRIE_DIR]})],
       ext_modules=ext_modules,
-      python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+      python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
       setup_requires=["pytest-runner", 'Cython>=0.28'],
       tests_require=["pytest", "hypothesis"])
diff --git a/src/cdatrie.pxd b/src/cdatrie.pxd
@@ -1,13 +1,13 @@
 # cython: profile=False
 from libc cimport stdio
 
-cdef extern from "../libdatrie/datrie/triedefs.h":
+cdef extern from "/usr/include/datrie/triedefs.h":
     ctypedef int AlphaChar # it should be utf32 letter
     ctypedef unsigned char TrieChar  # 1 byte
     ctypedef int TrieIndex
     ctypedef int TrieData  # int
 
-cdef extern from "../libdatrie/datrie/alpha-map.h":
+cdef extern from "/usr/include/datrie/alpha-map.h":
 
     struct AlphaMap:
         pass
@@ -20,7 +20,7 @@ cdef extern from "../libdatrie/datrie/alpha-map.h":
     int alpha_char_strlen (AlphaChar *str)
 
 
-cdef extern from "../libdatrie/datrie/trie.h":
+cdef extern from "/usr/include/datrie/trie.h":
 
     ctypedef struct Trie:
         pass

diff --git a/src/datrie.pyx b/src/datrie.pyx
@@ -1120,8 +1120,10 @@ cdef unicode unicode_from_alpha_char(cdatrie.AlphaChar* key, int len=0):
     if length == 0:
         length = cdatrie.alpha_char_strlen(key)*sizeof(cdatrie.AlphaChar)
     cdef char* c_str = <char*> key
-    return c_str[:length].decode('utf_32_le')
-
+    if sys.byteorder == 'little':
+        return c_str[:length].decode('utf_32_le')
+    else:
+        return c_str[:length].decode('utf_32_be')
 
 def to_ranges(lst):
     """

diff --git a/tox-bench.ini b/tox-bench.ini
@@ -1,5 +1,6 @@
 [tox]
-envlist = py27,py34,py35,py36,py37
+envlist = py27, py3{5,6,7,8,9}
+skip_missing_interpreters = true
 
 [testenv]
 commands=

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
-envlist = py27,py34,py35,py36,py37,py38
+envlist = py27, py3{5,6,7,8,9}
+skip_missing_interpreters = true
 
 [testenv]
 deps =
+202 −0		ChangeLog
+0 −2		Makefile.am
+23 −0		NEWS
+2 −2		README
+3 −3		configure.ac
+5 −5		datrie/alpha-map.c
+1 −1		datrie/alpha-map.h
+3 −3		datrie/darray.c
+1 −1		datrie/darray.h
+27 −2		datrie/tail.c
+1 −1		datrie/tail.h
+7 −5		datrie/typedefs.h
+16 −0		tests/Makefile.am
+95 −0		tests/test_byte_alpha.c
+186 −0		tests/test_byte_list.c
+7 −5		tests/test_file.c
+7 −6		tests/test_iterator.c
+5 −4		tests/test_nonalpha.c
+3 −2		tests/test_null_trie.c
+13 −12		tests/test_store-retrieve.c
+1 −1		tests/test_term_state.c
+5 −2		tests/test_walk.c
+3 −3		tests/utils.c
+2 −2		tests/utils.h
+41 −16		tools/trietool.c