try new packaging from opus

Author: JanCaha

.github/workflows/python_packages.yml

@@ -173,10 +173,10 @@ jobs:
       - name: Install deps
         run: |
           pip install --upgrade pip
-          pip install setuptools twine scikit-build wheel cmake
+          pip install build twine
 
       - name: Build sdist
-        run: python setup.py sdist
+        run: python -m build --sdist
 
       - uses: actions/upload-artifact@v4
         with:

geodiff/CMakeLists.txt

@@ -1,7 +1,7 @@
 # GEODIFF (MIT License)
 # Copyright (C) 2019 Peter Petrik
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.15)
 PROJECT(geodiffproject)
 SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
 SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
@@ -26,7 +26,11 @@ ENDIF()
 
 IF(SKBUILD)
   MESSAGE(STATUS "The geodiff is built using scikit-build for pygeodiff Python package")
-  FIND_PACKAGE(PythonExtensions REQUIRED)
+  # scikit-build-core provides the project version as SKBUILD_PROJECT_VERSION;
+  # allow an explicit -DPYGEODIFFVERSION override for standalone invocations.
+  IF(NOT PYGEODIFFVERSION)
+    SET(PYGEODIFFVERSION "${SKBUILD_PROJECT_VERSION}")
+  ENDIF()
   SET(GEODIFF_NAME "pygeodiff-${PYGEODIFFVERSION}-python${GEODIFF_NAME_SUFFIX}")
   IF (CMAKE_GENERATOR_PLATFORM STREQUAL "Win32")
     SET(GEODIFF_NAME "${GEODIFF_NAME}-win32")

pyproject.toml

@@ -1,2 +1,36 @@
 [build-system]
-requires = ["setuptools", "wheel", "scikit-build", "cmake"]
+requires = ["scikit-build-core>=0.10"]
+build-backend = "scikit_build_core.build"
+
+[project]
+name = "pygeodiff"
+version = "2.3.0"
+description = "Python wrapper around GeoDiff library"
+readme = "README.md"
+authors = [{ name = "Lutra Consulting Ltd.", email = "info@merginmaps.com" }]
+license = { text = "MIT" }
+requires-python = ">=3.7"
+keywords = ["diff", "gis", "geo", "geopackage", "merge"]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+]
+
+[project.urls]
+Homepage = "https://github.com/MerginMaps/geodiff"
+
+[tool.scikit-build]
+# The geodiff C++ library (CMakeLists.txt) lives in the geodiff/ subdirectory.
+cmake.source-dir = "geodiff"
+# Pure-Python package shipped alongside the compiled library.
+wheel.packages = ["pygeodiff"]
+# The old setup.py used packages=["pygeodiff"], which did not ship the tests.
+wheel.exclude = ["pygeodiff/tests/**"]
+# CMakeLists.txt declares 3.15; let scikit-build-core fetch a matching CMake.
+cmake.version = ">=3.15"
+
+[tool.scikit-build.cmake.define]
+ENABLE_TESTS = "OFF"
+ENABLE_COVERAGE = "OFF"
+BUILD_TOOLS = "OFF"
+PEDANTIC = "OFF"

scripts/update_version.py

@@ -28,6 +28,6 @@ def replace_in_file(filepath, regex, sub):
 print("patching " + about_file)
 replace_in_file(about_file, "__version__\s=\s\".*", "__version__ = \"" + ver + "\"")
 
-setup_file = os.path.join(dir_path, os.pardir, "setup.py")
-print("patching " + setup_file)
-replace_in_file(setup_file, "VERSION\s=\s\".*", "VERSION = \"" + ver + "\"")
+pyproject_file = os.path.join(dir_path, os.pardir, "pyproject.toml")
+print("patching " + pyproject_file)
+replace_in_file(pyproject_file, r'^version = ".*"', 'version = "' + ver + '"')