Add "tables to include" option + version bump to 2.3.0 + CI fixes (#254)

Author: JanCaha

.github/workflows/python_packages.yml

@@ -11,7 +11,6 @@ jobs:
       CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
       CIBW_ARCHS: x86_64
       CIBW_BEFORE_ALL_LINUX: dnf makecache && dnf install --assumeyes sqlite-devel
-      CIBW_BEFORE_BUILD: pip install setuptools scikit-build wheel cmake
       CIBW_TEST_COMMAND: python -c "import pygeodiff; pygeodiff.GeoDiff().version()"
 
     steps:
@@ -36,7 +35,6 @@ jobs:
     env:
       CIBW_BUILD: "*musllinux*"
       CIBW_BEFORE_ALL_LINUX: apk add sqlite-dev
-      CIBW_BEFORE_BUILD: pip install setuptools scikit-build wheel cmake
       CIBW_TEST_COMMAND: python -c "import pygeodiff; pygeodiff.GeoDiff().version()"
 
     steps:
@@ -59,11 +57,12 @@ jobs:
     name: Build wheels on Windows
     runs-on: windows-2025
     env:
-      CMAKE_GENERATOR: "Visual Studio 17 2022"
+      CMAKE_GENERATOR: "Visual Studio 18 2026"
       SQLite3_ROOT: "C:/vcpkg/installed/x64-windows"
       CIBW_SKIP: "*-win32"
       CIBW_TEST_COMMAND: python -c "import pygeodiff; pygeodiff.GeoDiff().version()"
       CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path C:/vcpkg/installed/x64-windows/bin --no-mangle-all -v -w {dest_dir} {wheel}"
+      MSBUILDDISABLENODEREUSE: "1"
 
     steps:
       - uses: actions/checkout@v3
@@ -77,7 +76,7 @@ jobs:
         run: |
           C:/vcpkg/vcpkg install sqlite3[rtree,fts3,json1] --triplet x64-windows
           C:/vcpkg/vcpkg integrate install
-          pip install setuptools scikit-build wheel cmake delvewheel
+          pip install delvewheel
           dir "C:/vcpkg/installed/x64-windows/bin"
 
       - name: Build wheels
@@ -88,41 +87,6 @@ jobs:
           path: ./wheelhouse/*.whl
           name: dist-windows
 
-  build_windows_32_wheels:
-    name: Build 32bit wheels on Windows
-    runs-on: windows-2025
-    env:
-      CMAKE_GENERATOR: "Visual Studio 17 2022"
-      CMAKE_GENERATOR_PLATFORM: "Win32"
-      SQLite3_ROOT: "C:/vcpkg/installed/x86-windows"
-      CIBW_SKIP: pp* *-win_amd64
-      CIBW_TEST_COMMAND: python -c "import pygeodiff; pygeodiff.GeoDiff().version()"
-      CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path C:/vcpkg/installed/x86-windows/bin --no-mangle-all -v -w {dest_dir} {wheel}"
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-python@v3
-        name: Install Python
-        with:
-          python-version: '3.9'
-          architecture: x86
-
-      - name: Install Deps
-        run: |
-          C:/vcpkg/vcpkg install sqlite3[rtree,fts3,json1] --triplet x86-windows
-          C:/vcpkg/vcpkg integrate install
-          pip install setuptools scikit-build wheel cmake delvewheel
-          dir "C:/vcpkg/installed/x86-windows/bin"
-
-      - name: Build wheels
-        uses: pypa/cibuildwheel@v3.3.1
-
-      - uses: actions/upload-artifact@v4
-        with:
-          path: ./wheelhouse/*.whl
-          name: dist-windows_32
-
   build_macos_arm64_wheels:
     name: Build wheels on macos-15 (arm64)
     runs-on: macos-15
@@ -146,10 +110,6 @@ jobs:
         with:
           python-version: '3.9'
 
-      - name: Install Deps
-        run: |
-          pip install setuptools scikit-build wheel cmake
-
       - name: Build wheels
         uses: pypa/cibuildwheel@v3.3.1
 
@@ -181,10 +141,6 @@ jobs:
         with:
           python-version: '3.9'
 
-      - name: Install Deps
-        run: |
-          pip install setuptools scikit-build wheel cmake
-
       - name: Build wheels
         uses: pypa/cibuildwheel@v3.3.1
 
@@ -207,10 +163,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:

.github/workflows/win_tests.yml

@@ -11,19 +11,14 @@ jobs:
     runs-on: windows-2025
     steps:
       - name: Checkout Geodiff
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: install deps
         run: |
           C:/vcpkg/vcpkg install sqlite3[rtree,fts3,json1] --triplet x64-windows
           C:/vcpkg/vcpkg integrate install
           dir "C:/vcpkg/installed/x64-windows/bin"
 
-      - name: set compiler environment
-        shell: cmd
-        run: |
-            CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x86
-
       - name: build geodiff
         shell: pwsh
         run: |
@@ -37,7 +32,7 @@ jobs:
           cd $env:GITHUB_WORKSPACE
           mkdir build
           cd build
-          exec { cmake -G "Visual Studio 17 2022" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake  -DENABLE_TESTS=ON  -DWITH_POSTGRESQL=FALSE ../geodiff  }
+          exec { cmake -G "Visual Studio 18 2026" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake  -DENABLE_TESTS=ON  -DWITH_POSTGRESQL=FALSE ../geodiff  }
           exec { cmake --build . --config Debug }
 
       - name: Run tests

MANIFEST.in

@@ -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")