Merge pull request #104 from urschrei/shugel/push-puxyyqsrmyyu

Switch to scikit-build

Author: urschrei

.github/dependabot.yml

@@ -9,8 +9,17 @@ updates:
       # if you use those, you don't need updates.
       - dependency-name: "actions/*"
 
-  - package-ecosystem: pip
+  - package-ecosystem: "uv"
     directory: "/"
     schedule:
-      interval: daily
-    open-pull-requests-limit: 10
+      interval: "monthly"
+    open-pull-requests-limit: 20
+    groups:
+      # Specify a name for the group, which will be used in pull request titles
+      # and branch names
+      python-non-security-dependencies:
+        # Define patterns to include dependencies in the group (based on
+        # dependency name)
+        applies-to: version-updates # Applies the group rule to version updates
+        patterns:
+          - "*"

.github/workflows/wheels.yml

@@ -5,12 +5,23 @@ permissions:
   attestations: write
   contents: read
 
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+    tags:
+      - 'v*'
+
+defaults:
+  run:
+    shell: bash
+
 env:
   rustlib: lonlat_bng
   wheelname: convertbng
   CIBW_BUILD_FRONTEND: build[uv]
 
-on: [push, pull_request]
 
 jobs:
   get_latest_lib_tag:

CMakeLists.txt

@@ -0,0 +1,75 @@
+cmake_minimum_required(VERSION 3.15...3.27)
+project(${SKBUILD_PROJECT_NAME} LANGUAGES C)
+
+# Find Python
+find_package(
+  Python
+  COMPONENTS Interpreter Development.Module NumPy
+  REQUIRED)
+
+# Get NumPy include directory
+message(STATUS "NumPy include directory: ${Python_NumPy_INCLUDE_DIRS}")
+
+# Cythonize the .pyx file to .c
+add_custom_command(
+  OUTPUT cutil.c
+  COMMENT "Cythonizing ${CMAKE_CURRENT_SOURCE_DIR}/src/convertbng/cutil.pyx"
+  COMMAND Python::Interpreter -m cython
+          "${CMAKE_CURRENT_SOURCE_DIR}/src/convertbng/cutil.pyx"
+          --output-file cutil.c
+          -I "${CMAKE_CURRENT_SOURCE_DIR}/src/convertbng"
+  DEPENDS src/convertbng/cutil.pyx src/convertbng/convertbng_p.pxd
+  VERBATIM)
+
+# Create the extension module
+python_add_library(cutil MODULE cutil.c WITH_SOABI)
+
+# Set include directories
+target_include_directories(cutil PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/convertbng
+  ${Python_NumPy_INCLUDE_DIRS}
+)
+
+# Link against the Rust library
+# The library is pre-built and located in src/convertbng/
+find_library(LONLAT_BNG_LIBRARY
+  NAMES lonlat_bng liblonlat_bng
+  PATHS ${CMAKE_CURRENT_SOURCE_DIR}/src/convertbng
+  NO_DEFAULT_PATH
+  REQUIRED
+)
+message(STATUS "Found lonlat_bng library: ${LONLAT_BNG_LIBRARY}")
+
+target_link_libraries(cutil PRIVATE ${LONLAT_BNG_LIBRARY})
+
+# Set RPATH for different platforms
+if(APPLE)
+  set_target_properties(cutil PROPERTIES
+    INSTALL_RPATH "@loader_path"
+    BUILD_WITH_INSTALL_RPATH TRUE
+  )
+elseif(UNIX)
+  set_target_properties(cutil PROPERTIES
+    INSTALL_RPATH "$ORIGIN"
+    BUILD_WITH_INSTALL_RPATH TRUE
+  )
+endif()
+
+# Install the extension module
+install(TARGETS cutil DESTINATION convertbng)
+
+# Install the shared library
+if(APPLE)
+  set(RDP_LIB_NAME "liblonlat_bng.dylib")
+elseif(UNIX)
+  set(RDP_LIB_NAME "liblonlat_bng.so")
+elseif(WIN32)
+  set(RDP_LIB_NAME "lonlat_bng.dll")
+endif()
+
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/convertbng/${RDP_LIB_NAME}
+        DESTINATION convertbng)
+
+# Install header file
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/convertbng/header.h
+        DESTINATION convertbng)

pyproject.toml

@@ -1,14 +1,15 @@
 [project]
 name = "convertbng"
-dynamic = ["version", "readme"]
+version = "0.7.9"
 description = "Fast lon, lat to and from ETRS89 and BNG (OSGB36) using the OS OSTN15 transform via Rust FFI"
-license = "BlueOak-1.0.0"
-license-files = ["LICENSE.md"]
+readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
     "numpy >= 2.0.0",
 ]
 authors = [{ name = "Stephan Hügel", email = "urschrei@gmail.com" }]
+license = "BlueOak-1.0.0"
+license-files = ["LICENSE.md"]
 keywords = ["Geo", "OSTN02", "OSTN15", "BNG", "OSGB36", "GIS"]
 classifiers = [
     "Programming Language :: Python",
@@ -29,31 +30,28 @@ classifiers = [
 Repository = "https://github.com/urschrei/convertbng"
 Tracker = "https://github.com/urschrei/convertbng/issues"
 
-[project.optional-dependencies]
-test = ["pytest >= 7.4.2"]
+[dependency-groups]
+dev = [
+    "pytest>=8.4.1",
+]
 
-[tool.setuptools.dynamic]
-readme = {file = "README.md", content-type = "text/markdown"}
+[tool.scikit-build]
+minimum-version = "build-system.requires"
+wheel.packages = ["src/convertbng"]
 
 [build-system]
-build-backend = "setuptools.build_meta"
 requires = [
-    "setuptools >= 45",
-    "setuptools-scm[toml] >= 6.2",
+    "scikit-build-core>=0.10",
     "numpy >= 2.0.0",
-    "cython >= 3.0.0",
-    "wheel >= 0.29.0",
+    "cython >= 3.1.0",
 ]
+build-backend = "scikit_build_core.build"
 
 [tool.pytest.ini_options]
-minversion = "6.2.2"
+minversion = "8.4.1"
 addopts = [
     "--import-mode=importlib",
 ]
 testpaths = [
     "tests",
 ]
-
-[tool.setuptools_scm]
-write_to = "src/_version.py"
-