cmake: modernize CMake infrastructure; adds modules, bindings; build Windows wheels

.github/workflows/cmake-ci.yml

@@ -0,0 +1,49 @@
+name: CMake CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  cmake-build-test:
+    name: CMake on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            deps: sudo apt-get update && sudo apt-get install -y cmake bzip2 gzip xz-utils flac zip unzip libbz2-dev liblzma-dev libflac-dev libpcre3-dev libzzip-dev
+          - os: macos-latest
+            deps: brew install --quiet cmake bzip2 flac xz pcre libzzip
+          - os: windows-latest
+            deps: choco install cmake --no-progress
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Install Python dependencies
+        run: python -m pip install numpy>2
+
+      - name: Install system dependencies
+        run: ${{ matrix.deps }}
+
+      - name: Configure CMake
+        working-directory: cmake
+        run: cmake -B build -DBUILD_PYTHON=ON -DGD_TEST=ON
+
+      - name: Build
+        working-directory: cmake
+        run: cmake --build build --config Release
+
+      - name: Run tests
+        working-directory: cmake
+        run: ctest --test-dir build --output-on-failure --build-config Release --no-tests=error

.github/workflows/package.yml

@@ -16,51 +16,15 @@ jobs:
       matrix:
         include:
           # macos-15-intel for x86_64 (min macOS 15.0), macos-14 for ARM (min macOS 14.0)
-          - os: macos-15-intel
-            python: '3.9'
-            build: 'cp39-macosx_x86_64'
-            target: '15.0'
-            prefix: /usr/local
-
-          - os: macos-15-intel
-            python: '3.10'
-            build: 'cp310-macosx_x86_64'
-            target: '15.0'
-            prefix: /usr/local
-
-          - os: macos-15-intel
-            python: '3.11'
-            build: 'cp311-macosx_x86_64'
-            target: '15.0'
-            prefix: /usr/local
-
           - os: macos-15-intel
             python: '3.12'
-            build: 'cp312-macosx_x86_64'
+            build: 'cp*-macosx_x86_64'
             target: '15.0'
             prefix: /usr/local
 
-          - os: macos-14
-            python: '3.9'
-            build: 'cp39-macosx_arm64'
-            target: '14.0'
-            prefix: /opt/homebrew
-
-          - os: macos-14
-            python: '3.10'
-            build: 'cp310-macosx_arm64'
-            target: '14.0'
-            prefix: /opt/homebrew
-
-          - os: macos-14
-            python: '3.11'
-            build: 'cp311-macosx_arm64'
-            target: '14.0'
-            prefix: /opt/homebrew
-
           - os: macos-14
             python: '3.12'
-            build: 'cp312-macosx_arm64'
+            build: 'cp*-macosx_arm64'
             target: '14.0'
             prefix: /opt/homebrew
 
@@ -69,6 +33,11 @@ jobs:
             build: 'cp*-manylinux_x86_64'
             prefix: /usr
 
+          - os: windows-latest
+            python: '3.12'
+            build: 'cp*-win_amd64'
+            prefix: 'C:\Program Files'
+
     steps:
       - name: Setup environment
         run: echo "PREFIX=${{ matrix.prefix }}" >> $GITHUB_ENV
@@ -87,43 +56,49 @@ jobs:
       - name: Setup macOS environment
         if: runner.os == 'macOS'
         run: |
-          brew install automake libtool
           echo "MACOSX_DEPLOYMENT_TARGET=${{ matrix.target }}" >> $GITHUB_ENV
-          echo CPPFLAGS="`python3-config --includes`" >> $GITHUB_ENV
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.21.3
+        run: python -m pip install cibuildwheel==3.3.0
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse bindings/python
         env:
           CIBW_BUILD: ${{ matrix.build }}
-          CIBW_SKIP: cp36* cp37* cp38*
+          CIBW_SKIP: cp38*
           CIBW_BEFORE_ALL_LINUX: >
-            yum install -y bzip2-devel flac-devel xz-devel pcre-devel zziplib-devel &&
-            .github/workflows/bootstrap.sh --disable-python &&
-            make
+            yum install -y cmake bzip2-devel flac-devel xz-devel pcre-devel zziplib-devel
           CIBW_BEFORE_ALL_MACOS: >
-            brew install bzip2 flac xz pcre libzzip &&
-            .github/workflows/bootstrap.sh --disable-python &&
-            make
+            brew install --quiet cmake bzip2 flac xz pcre libzzip
+          CIBW_BEFORE_ALL_WINDOWS: >
+            choco install cmake --no-progress
+          CIBW_ENVIRONMENT_MACOS: >
+            PKG_CONFIG_PATH=${{ matrix.prefix }}/lib/pkgconfig
+            PREFIX=${{ matrix.prefix }}
           CIBW_BEFORE_BUILD: >
-            python -m pip install "numpy>=2.0" &&
-            .github/workflows/bootstrap.sh &&
-            make -C bindings/python pyconstants.c
-          CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
-            LD_LIBRARY_PATH=$PWD/src/.libs auditwheel repair -w {dest_dir} {wheel}
-          CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
-            DYLD_LIBRARY_PATH=$PWD/src/.libs delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
+            python -m pip install "scikit-build-core>=0.5" "numpy>=2.0"
+          CIBW_BEFORE_BUILD_WINDOWS: >
+            pip install delvewheel "scikit-build-core>=0.5" "numpy>=2.0"
+          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >
+            delvewheel repair --extract-dir {dest_dir}\..\extract --add-path {dest_dir}\..\extract\bin -vv -w {dest_dir} {wheel}
           CIBW_BUILD_VERBOSITY: 1
-          CIBW_TEST_COMMAND: >
-            cd {package}/test &&
-            PYTHONPATH=`python -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])'`:$PYTHONPATH make check
+          CIBW_TEST_COMMAND_LINUX: >
+            python -c "import pygetdata; print(f'pygetdata version: {pygetdata.__version__}')" &&
+            cd {project}/bindings/python/test &&
+            python big_test.py
+          CIBW_TEST_COMMAND_MACOS: >
+            python -c "import pygetdata; print(f'pygetdata version: {pygetdata.__version__}')" &&
+            cd {project}/bindings/python/test &&
+            python big_test.py
+          CIBW_TEST_COMMAND_WINDOWS: >
+            python -c "import pygetdata; print(f'pygetdata version: {pygetdata.__version__}')" &&
+            cd /d {project}\bindings\python\test &&
+            python big_test.py
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: cibw-wheel-${{ matrix.os }}-${{ matrix.python }}
+          name: cibw-wheel-${{ matrix.os }}
           path: ./wheelhouse/pygetdata*.whl
 
   upload_pypi:

.gitignore

@@ -12,6 +12,9 @@ libpath_mangled
 Makefile
 Makefile.in
 
+CMakeFiles
+CMakeCache.txt
+
 /*.zip
 /*.tar.*
 /*.sig

bindings/cxx/internal.h

@@ -18,9 +18,7 @@
 // along with GetData; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
-#ifdef HAVE_CONFIG_H
 #include "gd_config.h"
-#endif
 
 /* To avoid including stuff out of tree, we include everything here,
  * even though getdata/dirfile.h will try to include it again.

bindings/cxx/test/big_test.cpp

@@ -18,9 +18,7 @@
 // along with GetData; if not, write to the Free Software Foundation, Inc.,
 // 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
-#ifdef HAVE_CONFIG_H
 #include "gd_config.h"
-#endif
 #undef GETDATA_LEGACY_API
 
 #include "getdata/dirfile.h"

bindings/idl/getdata.c

@@ -28,9 +28,7 @@
 #undef _POSIX_C_SOURCE
 #undef _SVID_SOURCE
 
-#ifdef HAVE_CONFIG_H
-# include "gd_config.h"
-#endif
+#include "gd_config.h"
 
 #ifdef GD_EXTERNAL
 # include <complex.h>

bindings/make_parameters.c

@@ -18,13 +18,13 @@
  * along with GetData; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#ifdef HAVE_CONFIG_H
 #include "gd_config.h"
-#endif
 
 #include <stdlib.h>
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #define GD_NO_LEGACY_API
 #include "getdata.h"

bindings/matlab/matlab.c

@@ -19,9 +19,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include "gd_config.h"
-#endif
 
 #ifdef GD_EXTERNAL
 # define GD_C89_API

bindings/python/pygetdata.c

@@ -922,7 +922,7 @@ static PyObject *gdpy_encoding_support(struct gdpy_fragment_t *self,
 
   n = gd_encoding_support(enc);
 
-  if (n == 0) {
+  if (n < 0) {
     Py_INCREF(Py_None);
     dreturn("%p", Py_None);
     return Py_None;

bindings/python/pyproject.toml

@@ -1,16 +1,26 @@
 [build-system]
-requires = ["setuptools", "setuptools-scm", "wheel", "numpy>=2.0"]
-build-backend = "setuptools.build_meta"
+requires = ["scikit-build-core>=0.5", "numpy>=2.0"]
+build-backend = "scikit_build_core.build"
 
 [project]
 name = "pygetdata"
 dependencies = ["numpy>=1.7"]
 dynamic = ["version"]
 
-[tool.setuptools]
-script-files = ["../../util/dirfile2ascii", "../../util/checkdirfile"]
+[tool.scikit-build]
+cmake.source-dir = "../../cmake"
+cmake.build-type = "Release"
+cmake.args = ["-DBUILD_PYTHON=ON", "-DGD_TEST=OFF", "-DGD_UTIL=ON", "-DBUILD_CXX=OFF"]
+install.components = ["Runtime"]
+wheel.install-dir = "."
 
-[tool.setuptools_scm]
-version_scheme = "only-version"
-local_scheme = "no-local-version"
+[tool.scikit-build.metadata.version]
+provider = "scikit_build_core.metadata.regex"
+input = "../../m4/version.m4"
+regex = '''
+m4_define\(getdata_major,\s*(?P<major>\d+)\)[\s\S]*
+m4_define\(getdata_minor,\s*(?P<minor>\d+)\)[\s\S]*
+m4_define\(getdata_revision,\s*(?P<micro>\d+)\)
+'''
+result = "{major}.{minor}.{micro}"
 

bindings/python/setup.py.in

@@ -95,7 +95,6 @@ setup(
         include_dirs = includes,
         library_dirs = [ join(libbuild_dir, '.libs') ],
         libraries = [ 'getdata' ],
-        define_macros = [ ('HAVE_CONFIG_H','1') ]
         )
       ]
     )

bindings/python/test/big_test.py

@@ -43,12 +43,12 @@ def B(s):
 def CheckOK(t):
   global ne
   ne+=1
-  print ("e[", t, "] =", sys.exc_info()[0], sys.exc_value)
+  print ("e[", t, "] =", sys.exc_info()[0], sys.exc_info()[1])
 
 def CheckOK2(t,m):
   global ne
   ne+=1
-  print ("e[", t, ",", m, "] =", sys.exc_info()[0], sys.exc_value)
+  print ("e[", t, ",", m, "] =", sys.exc_info()[0], sys.exc_info()[1])
 
 def CheckException(t,g):
   global ne
@@ -88,7 +88,7 @@ def CheckSimple2(t,m,v,g):
 
 def CheckEOS(t,v,g):
   global ne
-  if (re.search(g + "$", v) == None):
+  if (re.search(re.escape(g) + "$", v) == None):
     ne+=1
     print ("n[", t, "] =", v, "expected", g)
 
@@ -641,7 +641,7 @@ def CheckEOS(t,v,g):
   f = d.fragment(0)
 except:
   CheckOK(64)
-CheckEOS(64,f.name,"dirfile/format")
+CheckEOS(64,f.name,os.path.join("dirfile","format"))
 
 # 65: nfragments check
 try:
@@ -1053,7 +1053,7 @@ def CheckEOS(t,v,g):
   n = d.raw_filename("data")
 except:
   CheckOK(116)
-CheckEOS(116,n,"dirfile/data")
+CheckEOS(116,n,os.path.join("dirfile","data"))
 
 # 117: reference check
 try:
@@ -1976,7 +1976,7 @@ def CheckEOS(t,v,g):
   n = d.linterp_tablename("linterp")
 except:
   CheckOK(241)
-CheckEOS(241,n,"dirfile/lut")
+CheckEOS(241,n,os.path.join("dirfile","lut"))
 
 # 242: mcarrays
 try:
@@ -2247,9 +2247,9 @@ def CheckEOS(t,v,g):
 # 305: gd_match_entries
 try:
   n = d.match_entries(regex='^lin', fragment=0)
+  CheckSimple2(305, 1, n, [ B('lincom'), B('linterp') ])
 except:
-  CheckOK2(305, 0)
-CheckSimple2(305, 1, n, [ B('lincom'), B('linterp') ])
+  CheckException2(305, 0, pygetdata.UnsupportedError)  # Expected when regex unsupported
 
 # 306: gd_open_limit
 try: