generate cython

Author: maxbachmann

.github/workflows/pythonbuild.yml

@@ -157,18 +157,30 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'true'
-
       - uses: actions/setup-python@v2
-        name: Install Python
-        with:
-          python-version: '3.7'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pytest hypothesis mypy Cython==3.0.0a10
+
+      # The cythonized files allow installation from the sdist without cython
+      - name: Generate cython
+        run: |
+          chmod +x ./src/Levenshtein/generate.sh
+          ./src/Levenshtein/generate.sh
 
       - name: Build sdist
         run: |
-          pip3 install build; python3 -m build --sdist
+          git apply ./tools/sdist.patch
+          pip install build
+          python -m build --sdist
           # test whether tarball contains all files required for compiling
-          pip3 install dist/Levenshtein-*.tar.gz
-          pip3 uninstall Levenshtein --yes
+          pip install dist/Levenshtein-*.tar.gz
+
+      - name: Test with pytest and backtrace in case of SegFault
+        run: |
+          tools/seg_wrapper.sh pytest tests
 
       - uses: actions/upload-artifact@v2
         with:

CMakeLists.txt

@@ -20,7 +20,6 @@ endif()
 
 find_package(PythonExtensions REQUIRED)
 find_package(Python COMPONENTS Interpreter Development)
-find_package(Cython REQUIRED)
 
 find_package(rapidfuzz 1.0.4 QUIET)
 if (rapidfuzz_FOUND)

MANIFEST.in

@@ -8,7 +8,7 @@ include src/Levenshtein/**/*.pyi
 include src/Levenshtein/py.typed
 
 recursive-include src/Levenshtein CMakeLists.txt
-recursive-include src/Levenshtein *.hpp *.h *.cpp *.pyx *.pxd
+recursive-include src/Levenshtein *.hpp *.h *.cpp *.pyx *.pxd *.cxx
 
 include extern/rapidfuzz-cpp/LICENSE
 include extern/rapidfuzz-cpp/CMakeLists.txt

src/Levenshtein/CMakeLists.txt

@@ -1,5 +1,15 @@
 
-add_cython_target(levenshtein_cpp CXX)
+function(create_cython_target _name)
+if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/${_name}.cxx)
+    set(${_name} ${CMAKE_CURRENT_LIST_DIR}/${_name}.cxx PARENT_SCOPE)
+else()
+    find_package(Cython REQUIRED)
+    add_cython_target(${_name} CXX)
+    set(${_name} ${_name} PARENT_SCOPE)
+endif()
+endfunction(create_cython_target)
+
+create_cython_target(levenshtein_cpp)
 add_library(levenshtein_cpp MODULE ${levenshtein_cpp} ${LEV_BASE_DIR}/Levenshtein-c/_levenshtein.cpp)
 target_compile_features(levenshtein_cpp PUBLIC cxx_std_14)
 target_include_directories(levenshtein_cpp PRIVATE ${LEV_BASE_DIR}/Levenshtein-c)

src/Levenshtein/generate.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+curdir="${0%/*}"
+
+generate_cython()
+{
+  python -m cython -I "$curdir" --cplus "$curdir"/"$1".pyx -o "$curdir"/"$1".cxx || exit 1
+  echo "Generated $curdir/$1.cxx"
+}
+
+generate_cython levenshtein_cpp

tools/backtrace

@@ -0,0 +1,2 @@
+backtrace
+quit

tools/sdist.patch

@@ -0,0 +1,13 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 13a4e16..edb35af 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -3,7 +3,6 @@ requires = [
+     "setuptools",
+     "scikit-build>=0.13.0",
+     "cmake",
+-    "ninja; platform_system!='Windows'",
+-    "Cython==3.0.0a10"
++    "ninja; platform_system!='Windows'"
+ ]
+ build-backend = "setuptools.build_meta"

tools/seg_wrapper.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+
+ulimit -c unlimited
+"$@"
+if [[ $? -eq 139 ]]; then
+    coredumpctl gdb -1 -A "--batch -x $SCRIPTPATH/backtrace"
+fi