Merge branch 'master' into features/oi

Author: fbriol

.gitattributes

@@ -0,0 +1,5 @@
+# VERSION.txt holds a `$Format:...$` placeholder that stays literal in a working
+# tree and is expanded by `git archive`. This is what gives a version to source
+# tarballs (GitHub "Download ZIP", release tarballs, CMake FetchContent URL
+# downloads), which carry no .git directory and no sdist metadata.
+VERSION.txt export-subst

conda/linux.yml .github/environments/linux.ymlconda/linux.yml renamed to .github/environments/linux.yml

@@ -2,6 +2,7 @@ name: pyinterp
 dependencies:
   - libboost-headers >= 1.90
   - cmake
+  - ninja
   - dask
   - numcodecs
   - numpy

conda/osx.yml .github/environments/osx.ymlconda/osx.yml renamed to .github/environments/osx.yml

@@ -51,7 +51,7 @@ jobs:
         create-args: |
           python=3.12
         environment-name: pyinterp
-        environment-file: conda/linux.yml
+        environment-file: .github/environments/linux.yml
         init-shell: bash
 
     - name: Generate coverage data
@@ -94,7 +94,7 @@ jobs:
         create-args: |
           python=${{ matrix.python-version }}
         environment-name: pyinterp
-        environment-file: conda/linux.yml
+        environment-file: .github/environments/linux.yml
         init-shell: bash
 
     - name: Build extension
@@ -189,7 +189,7 @@ jobs:
         create-args: |
           python=3.14
         environment-name: pyinterp
-        environment-file: conda/osx.yml
+        environment-file: .github/environments/osx.yml
         init-shell: bash
 
     - name: Build extension
@@ -245,11 +245,24 @@ jobs:
         create-args: |
           python=3.14
         environment-name: pyinterp
-        environment-file: conda/win.yml
+        environment-file: .github/environments/win.yml
+
+    # The windows-2025 image now ships Visual Studio 18 (2026), so the pinned
+    # "Visual Studio 17 2022" CMake generator no longer finds an instance.
+    # Activate the MSVC developer environment (cl.exe + Ninja on PATH) and build
+    # with the version-independent Ninja generator instead (see CMAKE_GEN).
+    - name: Set up MSVC toolchain
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: x64
 
     - name: Building Testing Python Package
       shell: bash -l {0}
+      env:
+        CMAKE_GEN: Ninja
       run: |
-        python setup.py build_ext --cmake-args="-DBoost_INCLUDE_DIRS=$CONDA_PREFIX/Library/include"
+        # Convert the backslashes in $CONDA_PREFIX to forward slashes; otherwise
+        # they are stripped when the argument is forwarded to CMake.
+        python setup.py build_ext --cmake-args="-DBoost_INCLUDE_DIRS=${CONDA_PREFIX//\\//}/Library/include"
         python setup.py build
         pytest -v -ra

conda/win.yml .github/environments/win.ymlconda/win.yml renamed to .github/environments/win.yml

@@ -54,12 +54,25 @@ jobs:
           prefix="${MAMBA_ROOT_PREFIX//\\//}/envs/boost-deps/Library"
           echo "BOOST_PREFIX=${prefix}" >> "$GITHUB_ENV"
 
+      # The windows-2025 image now ships Visual Studio 18 (2026), so the pinned
+      # "Visual Studio 17 2022" CMake generator no longer finds an instance.
+      # Activate the MSVC developer environment (cl.exe + Ninja on PATH) before
+      # cibuildwheel runs; its exported variables propagate to the isolated
+      # build subprocesses, which build with the Ninja generator (CMAKE_GEN).
+      - name: Set up MSVC toolchain (Windows)
+        if: runner.os == 'Windows'
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x64
+
       - name: Build wheels
         uses: pypa/cibuildwheel@v3.0
         env:
-          # Windows: point CMake at the conda-forge Boost headers
+          # Windows: point CMake at the conda-forge Boost headers and build with
+          # the version-independent Ninja generator (VS 18 broke the VS 17 one).
           CIBW_ENVIRONMENT_WINDOWS: >-
             CMAKE_PREFIX_PATH="${{ env.BOOST_PREFIX }}"
+            CMAKE_GEN="Ninja"
           # macOS: arm64 only (free Intel runners are deprecated).
           CIBW_ARCHS_MACOS: ${{ matrix.cibw_archs_macos }}
           # Sanity-check every built wheel imports and exposes its version.

.github/workflows/ci.yaml

@@ -5,7 +5,7 @@ repos:
       - id: check-case-conflict
       - id: check-docstring-first
       - id: check-yaml
-        exclude: "(conda/meta.yaml|.clang\\-format)$"
+        exclude: "\\.clang\\-format$"
       - id: debug-statements
       - id: end-of-file-fixer
       - id: mixed-line-ending
@@ -18,7 +18,7 @@ repos:
     - id: pyupgrade
       args: [--py311-plus]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.14
+    rev: v0.15.22
     hooks:
       - id: ruff
         args: [--fix]
@@ -37,18 +37,20 @@ repos:
       types: [file]
       files: CMakeLists.txt
   - repo: https://github.com/codespell-project/codespell
-    rev: "v2.4.2"
+    rev: "v2.4.3"
     hooks:
     - id: codespell
       exclude: "(cf.py|pyinterp/.*json)$"
       args: [--ignore-words-list, "degreee"] # degreeE is a valid axis unit
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v22.1.5
+    rev: v22.1.8
     hooks:
       - id: clang-format
-        exclude: "(dataset.*json)$"
+        # *.hpp.in templates hold @VAR@ placeholders that clang-format, which
+        # parses its input as C++, cannot handle.
+        exclude: "(dataset.*json|\\.in)$"
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v2.1.0
+    rev: v2.3.0
     hooks:
       - id: mypy
         exclude: (examples|docs)/

.github/workflows/wheels.yml

@@ -22,10 +22,41 @@ endif()
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
                       "${CMAKE_MODULE_PATH}")
 
+# ##############################################################################
+# Resolve the project version
+# ##############################################################################
+# Must run before project(), which needs the numeric version up front. See
+# cmake/PyinterpVersion.cmake for the list of sources and their precedence.
+include(PyinterpVersion)
+pyinterp_resolve_version("${CMAKE_CURRENT_SOURCE_DIR}")
+
 # ##############################################################################
 # Project settings
 # ##############################################################################
-project(pyinterp LANGUAGES CXX)
+project(
+  pyinterp
+  VERSION ${PYINTERP_VERSION_STRING}
+  LANGUAGES CXX)
+
+# Export the version to a parent project (add_subdirectory, FetchContent).
+pyinterp_publish_version()
+
+# ##############################################################################
+# Sub-project detection
+# ##############################################################################
+# When pyinterp is consumed as a CMake sub-project, the caller wants the C++
+# library, not the Python extension: building the bindings would drag in Python,
+# nanobind and the stub generation for nothing. PROJECT_IS_TOP_LEVEL needs CMake
+# 3.21, so derive it by hand to keep the 3.19 requirement.
+if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+  set(PYINTERP_IS_TOP_LEVEL ON)
+else()
+  set(PYINTERP_IS_TOP_LEVEL OFF)
+endif()
+
+option(PYINTERP_BUILD_PYTHON_BINDINGS
+       "Build the pyinterp.core Python extension" ${PYINTERP_IS_TOP_LEVEL})
+option(PYINTERP_BUILD_TESTS "Build the C++ unit tests" ${PYINTERP_IS_TOP_LEVEL})
 
 # ##############################################################################
 # CMake policies
@@ -277,7 +308,9 @@ if(NOT WIN32)
 endif()
 
 # Python
-if(CMAKE_CROSSCOMPILING OR DEFINED ENV{CONDA_BUILD_CROSS_COMPILATION})
+if(NOT PYINTERP_BUILD_PYTHON_BINDINGS)
+  # Nothing to do: the Python extension is not being built.
+elseif(CMAKE_CROSSCOMPILING OR DEFINED ENV{CONDA_BUILD_CROSS_COMPILATION})
   if(NOT DEFINED PYTHON_ROOT_DIR AND DEFINED ENV{PREFIX})
     set(PYTHON_ROOT_DIR "$ENV{PREFIX}")
   endif()
@@ -342,7 +375,9 @@ else()
     OPTIONAL_COMPONENTS Development.SABIModule
     REQUIRED)
 endif()
-include_directories(SYSTEM PRIVATE ${Python_INCLUDE_DIRS})
+if(PYINTERP_BUILD_PYTHON_BINDINGS)
+  include_directories(SYSTEM ${Python_INCLUDE_DIRS})
+endif()
 
 # BLAS
 #
@@ -372,7 +407,7 @@ if(BLAS_FOUND)
     if(MKL_INCLUDE_DIR)
       add_definitions(-DEIGEN_USE_MKL_ALL)
       add_definitions(-DMKL_LP64)
-      include_directories(SYSTEM PRIVATE ${MKL_INCLUDE_DIR})
+      include_directories(SYSTEM ${MKL_INCLUDE_DIR})
     endif()
   endif()
 else()
@@ -398,12 +433,13 @@ else()
 endif()
 
 # Eigen3
-include_directories(SYSTEM PRIVATE
-                    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen)
+include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen)
 
 # GoogleTest
-include(CTest)
-find_package(GTest)
+if(PYINTERP_BUILD_TESTS)
+  include(CTest)
+  find_package(GTest)
+endif()
 
 # ##############################################################################
 # Parse FFT implementation configuration
@@ -431,8 +467,7 @@ endif()
 
 # MKL does not provide a Discrete Cosine Transform (DCT). Always use pocketfft
 # for DCTs even when MKL is chosen as the FFT backend.
-include_directories(SYSTEM PRIVATE
-                    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/pocketfft)
+include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/pocketfft)
 if(FFT_IMPLEMENTATION STREQUAL "pocketfft")
   set(FFT_LIBRARIES)
 endif()
@@ -475,9 +510,11 @@ endif()
 # ##############################################################################
 # Add subdirectories
 # ##############################################################################
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/nanobind)
-include_directories(SYSTEM
-                    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/nanobind/include)
+if(PYINTERP_BUILD_PYTHON_BINDINGS)
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/nanobind)
+  include_directories(SYSTEM
+                      ${CMAKE_CURRENT_SOURCE_DIR}/third_party/nanobind/include)
+endif()
 
 # ##############################################################################
 # External dependencies
@@ -545,14 +582,14 @@ if(NOT Boost_FOUND)
   check_boost_version("${Boost_INCLUDE_DIRS}" "1.90.0")
 endif()
 
-include_directories(SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
+include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 
 add_subdirectory(cxx)
 
 # ##############################################################################
 # Disable clang-tidy for third-party targets (after add_subdirectory)
 # ##############################################################################
-if(ENABLE_CLANG_TIDY)
+if(ENABLE_CLANG_TIDY AND TARGET nanobind-static)
   set_target_properties(nanobind-static PROPERTIES CXX_CLANG_TIDY "")
 endif()
 
@@ -587,6 +624,8 @@ format_enabled(ENABLE_CLANG_TIDY CLANG_TIDY_LINE)
 
 set(CONFIG_LINES
     "==================[ PyInterp Configuration Summary ]=================="
+    "Version:                ${PYINTERP_VERSION_FULL}"
+    "Version source:         ${PYINTERP_VERSION_SOURCE}"
     "Platform:               ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR}"
     "Build type:             ${CMAKE_BUILD_TYPE}"
     "CMake Version:          ${CMAKE_VERSION}"

.pre-commit-config.yaml

@@ -3,8 +3,12 @@ recursive-include docs *
 recursive-include cxx *
 recursive-include pyinterp *.pyi
 recursive-include third_party *
+recursive-include cmake *.cmake
 recursive-exclude scripts *
+include scripts/generate_geometry_stubs.py
+include scripts/resolve_version.py
 include pyinterp/_version.py
+include VERSION.txt
 include CMakeLists.txt
 include CODE_OF_CONDUCT.md
 include LICENSE

CMakeLists.txt

@@ -0,0 +1 @@
+$Format:%(describe:tags=true)$