change to newest version of cibuildwheel

Author: lonvia

.github/workflows/build_wheels.yml

@@ -7,62 +7,51 @@ on:
 
 jobs:
   build_wheels:
-    name: Build wheels on ${{ matrix.os }} for ${{ matrix.arch }}
+    name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-13, macos-14]
-        arch: [native]
+        os: [ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-latest]
+        vcpkg: [none]
         include:
-          - os: ubuntu-20.04
-            arch: aarch64
+         - os: windows-latest
+           vcpkg: 'C:/vcpkg/installed/x64-windows'
+         - os: windows-11-arm
+           vcpkg: 'C:/vcpkg/installed/arm64-windows'
 
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/checkout@v4
-        with:
-          repository: pybind/pybind11
-          ref: v2.11.1
-          path: contrib/pybind11
-
-      - uses: actions/checkout@v4
-        with:
-          repository: mapbox/protozero
-          ref: v1.7.1
-          path: contrib/protozero
-
-      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
-          repository: osmcode/libosmium
-          ref: v2.20.0
-          path: contrib/libosmium
+          python-version: '3.13'
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        if: ${{ matrix.arch == 'aarch64' }}
+      - name: Install requirements
+        run: python -m pip install cibuildwheel build
 
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.8'
+      - name: Get dependencies via sdist
+        run: python -m build --sdist
 
       - name: Build wheels
-        uses: pypa/[email protected]
+        run: |
+          python -m cibuildwheel --output-dir wheelhouse
+        shell: bash
         env:
-           CIBW_ARCHS: ${{ matrix.arch }}
-           CIBW_SKIP: "pp* *musllinux* cp37-macosx_* {cp37,cp38}-*linux_aarch64"
-           CIBW_TEST_REQUIRES: pytest pytest-httpserver shapely
-           CIBW_TEST_REQUIRES_LINUX: urllib3<2.0 pytest pytest-httpserver shapely
+           CIBW_ENABLE: cpython-freethreading
+           CIBW_ARCHS: "native"
+           CIBW_SKIP: "*musllinux*"
+           CIBW_TEST_REQUIRES: pytest pytest-httpserver
            CIBW_TEST_COMMAND: pytest {project}/test
            CIBW_BUILD_FRONTEND: build
            CIBW_BEFORE_BUILD_LINUX: yum install -y expat-devel boost-devel zlib-devel bzip2-devel lz4-devel
            CIBW_BEFORE_BUILD_MACOS: brew install boost
-           CIBW_BEFORE_BUILD_WINDOWS: vcpkg install bzip2:x64-windows expat:x64-windows zlib:x64-windows boost-variant:x64-windows boost-iterator:x64-windows lz4:x86-windows
+           CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=11.0 SKBUILD_CMAKE_ARGS=-DWITH_LZ4=OFF
+           CIBW_BEFORE_BUILD_WINDOWS: vcpkg install bzip2 expat zlib boost-variant boost-iterator lz4
            CIBW_ENVIRONMENT_WINDOWS: 'CMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"'
-           CIBW_ENVIRONMENT_MACOS: CMAKE_WITH_LZ4=OFF MACOSX_DEPLOYMENT_TARGET=11.0
+           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: 'pipx run delvewheel repair --add-path ${{ matrix.vcpkg }}/bin/ --add-path ${{ matrix.vcpkg }}/debug/bin -w {dest_dir} {wheel}'
 
       - uses: actions/upload-artifact@v4
         with:
-          name: pyosmium-wheels-${{ matrix.os }}-${{ matrix.arch }}
+          name: pyosmium-wheels-${{ matrix.os }}
           path: ./wheelhouse/*.whl

CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.15...4.0)
+cmake_policy(VERSION 3.15)
 project(osmium LANGUAGES CXX)
 
 option(WITH_LZ4 "Build with lz4 support for PBF files" ON)
@@ -59,7 +60,7 @@ endif()
 
 message(STATUS "Building in C++${CMAKE_CXX_STANDARD} mode")
 
-find_package(Boost 1.55 REQUIRED COMPONENTS)
+find_package(Boost 1.66 REQUIRED COMPONENTS)
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 
 # Modules without any Python code and just one source file.