fix find_longest_match

Author: maxbachmann

.github/workflows/releasebuild.yml

@@ -11,14 +11,27 @@ on:
 jobs:
   build_wheels_windows:
     name: Build wheel on ${{ matrix.os }}/auto/${{matrix.python_tag}}
-    runs-on: ${{ matrix.os }}
+    runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
-        python_tag: ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*"]
-        os: [windows-latest]
+        arch: [auto32, auto64]
+        python_tag: ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*", "pp37-*", "pp38-*"]
+        exclude:
+          # PyPy only supports x86_64 on Windows
+          - arch: auto32
+            python_tag: "pp37-*"
+          - arch: auto32
+            python_tag: "pp38-*"
+
+          # PyPy Windows is currently broken in scikit-build
+          - arch: auto64
+            python_tag: "pp37-*"
+          - arch: auto64
+            python_tag: "pp38-*"
     env:
       CIBW_BUILD: ${{matrix.python_tag}}
+      CIBW_ARCHS: ${{matrix.arch}}
       CIBW_TEST_REQUIRES: pytest
       CIBW_TEST_COMMAND: pytest {package}/tests
       CIBW_BUILD_VERBOSITY: 3
@@ -42,14 +55,25 @@ jobs:
 
   build_wheels_macos:
     name: Build wheel on ${{ matrix.os }}/auto/${{matrix.python_tag}}
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix:
+        arch: [x86_64, arm64, universal2]
         python_tag: ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*"]
-        os: [macos-latest]
+        exclude:
+          # MacOS Arm only supported since Python 3.8
+          - arch: arm64
+            python_tag: "cp36-*"
+          - arch: arm64
+            python_tag: "cp37-*"
+          - arch: universal2
+            python_tag: "cp36-*"
+          - arch: universal2
+            python_tag: "cp37-*"
     env:
       CIBW_BUILD: ${{matrix.python_tag}}
+      CIBW_ARCHS: ${{matrix.arch}}
       CIBW_TEST_REQUIRES: pytest
       CIBW_TEST_COMMAND: pytest {package}/tests
       CIBW_BUILD_VERBOSITY: 3
@@ -71,46 +95,20 @@ jobs:
         with:
           path: ./wheelhouse/*.whl
 
-  build_wheels_apple_silicon:
-    name: Build wheel on macos-latest/universal2+arm64/${{matrix.python_tag}}
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python_tag: ["cp38-*", "cp39-*", "cp310-*"]
-    env:
-      CIBW_BUILD: ${{matrix.python_tag}}
-      CIBW_ARCHS_MACOS: "universal2 arm64"
-      CIBW_BUILD_VERBOSITY: 3
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: 'true'
-
-      - uses: actions/setup-python@v2
-
-      - name: Build wheels
-        uses: pypa/[email protected]
-        with:
-          output-dir: wheelhouse
-
-      - name: Upload wheels
-        uses: actions/upload-artifact@v2
-        with:
-          path: ./wheelhouse/*.whl
-
-  build_wheels_manylinux:
+  build_wheels_linux:
     name: Build wheels on ubuntu-latest/${{matrix.arch}}/${{matrix.python_tag}}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        arch: [auto]
-        python_tag: [ "cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*"]
+        # disable s390x and ppc64le wheels while they are not provided by numpy
+        # arch: [auto, aarch64, ppc64le, s390x]
+        arch: [auto, aarch64]
+        python_tag: [ "cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*", "pp37-*", "pp38-*"]
     env:
       CIBW_ARCHS_LINUX: ${{matrix.arch}}
       CIBW_BUILD: ${{matrix.python_tag}}
+      CIBW_SKIP: "*musllinux_*"
       CIBW_TEST_SKIP: "*-manylinux_{aarch64,ppc64le,s390x}"
       CIBW_TEST_REQUIRES: pytest
       CIBW_TEST_COMMAND: pytest {package}/tests
@@ -146,6 +144,17 @@ jobs:
 
       - uses: actions/setup-python@v2
 
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install Cython==3.0.0a10
+
+      # The cythonized files allow installation from the sdist without cython
+      - name: Generate cython
+        run: |
+          chmod +x ./src/cython/generate.sh
+          ./src/cython/generate.sh
+
       - name: Build sdist
         run: |
           pip3 install build; python3 -m build --sdist
@@ -159,7 +168,7 @@ jobs:
 
   deploy-wheels:
     if: github.event_name == 'release' && github.event.action == 'published'
-    needs: [build_wheels_windows, build_wheels_macos, build_wheels_apple_silicon, build_wheels_manylinux, build_sdist]
+    needs: [build_wheels_windows, build_wheels_macos, build_wheels_linux, build_sdist]
     name: deploy wheels to pypi
     runs-on: ubuntu-18.04
 

.gitignore

@@ -150,3 +150,5 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+
+*.cxx

CMakeLists.txt

@@ -1,18 +1,23 @@
 cmake_minimum_required(VERSION 3.12.0)
 
 cmake_policy(SET CMP0054 NEW)
+set(SKBUILD_LINK_LIBRARIES_KEYWORD PRIVATE)
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
 endif()
 
-project(rapidfuzz LANGUAGES C CXX)
+project(cydifflib LANGUAGES C CXX)
+
+if (MSVC)
+    add_compile_options(/W4)
+else()
+    add_compile_options(-Wall -Wextra -pedantic)
+endif()
 
 find_package(PythonExtensions REQUIRED)
 find_package(Python COMPONENTS Interpreter Development)
 find_package(Cython REQUIRED)
 
-set(RAPIDFUZZ_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-
 add_subdirectory(src/cython)

MANIFEST.in

@@ -5,4 +5,4 @@ include LICENSE
 include pyproject.toml
 
 include src/cython/CMakeLists.txt
-include src/cython/_initialize.pyx
+recursive-include src/cython *.pyx *.cxx

README.md

@@ -71,4 +71,4 @@ PRs are welcome!
 Thank you :heart:
 
 ## ⚠️ License
-Copyright 2021 - present [maxbachmann](https://github.com/maxbachmann). `CyDifflib` is free and open-source software licensed under the [MIT License](https://github.com/maxbachmann/CyDifflib/blob/main/LICENSE).
+Copyright 2021-present [Max Bachmann](https://github.com/maxbachmann). `CyDifflib` is free and open-source software licensed under the [MIT License](https://github.com/maxbachmann/CyDifflib/blob/main/LICENSE).