Merge pull request #13 from henryiii/FindPython

[FindPython] Work around PyPy bug

Author: maxbachmann

.github/workflows/branchbuild.yml

@@ -1,4 +1,4 @@
-name: Build
+name: Test Build
 
 on:
   push:
@@ -31,7 +31,7 @@ jobs:
         run: |
           pip install build; python -m build --sdist
           # test whether tarball contains all files required for compiling
-          pip install dist/jarowinkler-*.tar.gz
+          pip install dist/jarowinkler-*.tar.gz -v
 
       - name: Test type stubs
         run: |

.github/workflows/releasebuild.yml

@@ -38,7 +38,7 @@ jobs:
           git apply ./tools/sdist.patch
           pip install build; python -m build --sdist
           # test whether tarball contains all files required for compiling
-          pip install dist/jarowinkler-*.tar.gz
+          pip install dist/jarowinkler-*.tar.gz -vvv
 
       - name: Test type stubs
         run: |
@@ -71,14 +71,6 @@ jobs:
             python_tag: "pp38-*"
           - arch: auto32
             python_tag: "pp39-*"
-
-          # PyPy Windows is currently broken in scikit-build
-          - arch: auto64
-            python_tag: "pp37-*"
-          - arch: auto64
-            python_tag: "pp38-*"
-          - arch: auto64
-            python_tag: "pp39-*"
     env:
       CIBW_BUILD: ${{matrix.python_tag}}
       CIBW_ARCHS: ${{matrix.arch}}

CMakeLists.txt

@@ -6,13 +6,23 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 
 project(jarowinkler LANGUAGES C CXX)
 
-find_package(PythonExtensions REQUIRED)
 if(CMAKE_VERSION VERSION_LESS 3.18)
     find_package(Python COMPONENTS Interpreter Development REQUIRED)
 else()
+    set(Python_ARTIFACTS_INTERACTIVE TRUE)
     find_package(Python COMPONENTS Interpreter Development.Module REQUIRED)
 endif()
 
+if("${Python_INTERPRETER_ID}" STREQUAL "PyPy")
+    message(STATUS "PyPy SOABI: ${Python_SOABI}")
+    execute_process(
+        COMMAND "${Python_EXECUTABLE}" -c
+                "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX').split('.')[1])"
+        OUTPUT_VARIABLE Python_SOABI
+        OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ECHO STDOUT)
+    message(STATUS "Corrected SOABI: ${Python_SOABI}")
+endif()
+
 include(FetchContent)
 
 set(JW_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)

pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires = [
     "setuptools>=42",
-    "scikit-build>=0.13.0",
+    "scikit-build @ git+https://github.com/scikit-build/scikit-build@master",
     "Cython==3.0.0a11",
     "rapidfuzz_capi==1.0.5"
 ]

src/jarowinkler/CMakeLists.txt

@@ -11,9 +11,8 @@ function(create_cython_target _name)
 endfunction(create_cython_target)
 
 create_cython_target(_initialize_cpp)
-add_library(_initialize_cpp MODULE ${_initialize_cpp})
+Python_add_library(_initialize_cpp MODULE WITH_SOABI ${_initialize_cpp})
 target_compile_features(_initialize_cpp PUBLIC cxx_std_14)
 target_include_directories(_initialize_cpp PRIVATE ${RF_CAPI_PATH} ${JW_BASE_DIR}/jarowinkler)
 target_link_libraries(_initialize_cpp PRIVATE jaro_winkler::jaro_winkler)
-python_extension_module(_initialize_cpp)
 install(TARGETS _initialize_cpp LIBRARY DESTINATION src/jarowinkler)

tools/sdist.patch

@@ -5,7 +5,7 @@ index 1f4d4d6..1f94979 100644
 @@ -2,7 +2,6 @@
  requires = [
      "setuptools>=42",
-     "scikit-build>=0.13.0",
+     "scikit-build @ git+https://github.com/scikit-build/scikit-build@master",
 -    "Cython==3.0.0a11",
      "rapidfuzz_capi==1.0.5"
  ]