Skip to content

Fix windows build #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
clarisma wants to merge 5 commits into from
Closed

Fix windows build #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17f041a
Use Ninja as build system for Windows
clarisma Oct 13, 2026
9e24e13
Enable msvc setup for ARM
clarisma Oct 13, 2026
b5a06b7
Use a fixed build directory
clarisma Oct 13, 2026
097bb08
Fix test setup for free-threaded Shapely 2.2
clarisma Oct 13, 2026
5b2a75d
Let scikit-build configure Ninja
clarisma Oct 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/build_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: python -m pip install cibuildwheel build

- name: Get dependencies via sdist
run: python -m build --sdist
run: python -m build --sdist -C build-dir=build/sdist

- name: Build wheels
run: |
Expand All @@ -44,10 +44,13 @@ jobs:
CIBW_TEST_REQUIRES: pytest pytest-httpserver
CIBW_TEST_COMMAND: pytest {project}/test
CIBW_BUILD_FRONTEND: build
CIBW_CONFIG_SETTINGS_WINDOWS: "build-dir=build/{wheel_tag}"
CIBW_BEFORE_BUILD_LINUX: yum install -y expat-devel zlib-devel bzip2-devel lz4-devel
CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=11.0 SKBUILD_CMAKE_ARGS=-DWITH_LZ4=OFF
CIBW_BEFORE_BUILD_WINDOWS: vcpkg install bzip2 expat zlib lz4
CIBW_ENVIRONMENT_WINDOWS: 'CMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"'
CIBW_ENVIRONMENT_WINDOWS: >-
CMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"
CMAKE_GENERATOR=Ninja
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@v7
Expand Down
42 changes: 28 additions & 14 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,10 +408,17 @@ jobs:

env:
VCPKG_DEFAULT_BINARY_CACHE: C:/vcpkg_binary_cache
CMAKE_GENERATOR: Ninja
CMAKE_TOOLCHAIN_FILE: C:/vcpkg/scripts/buildsystems/vcpkg.cmake

steps:
- uses: actions/checkout@v7

- name: Set up MSVC
uses: ilammy/msvc-dev-cmd@v1
with:
arch: amd64

- uses: actions/cache@v6
with:
path: |
Expand All @@ -423,7 +430,7 @@ jobs:
shell: bash

- name: Install packages
run: vcpkg install bzip2:x64-windows expat:x64-windows zlib:x64-windows lz4:x86-windows
run: vcpkg install bzip2:x64-windows expat:x64-windows zlib:x64-windows lz4:x64-windows
shell: bash

- name: Set up Python 3.8
Expand All @@ -434,7 +441,7 @@ jobs:
- name: Build package 3.8
run: |
pip install build wheel
python -m build
python -m build -C build-dir="$GITHUB_WORKSPACE/build/{state}-{wheel_tag}"
shell: bash
env:
CMAKE_TOOLCHAIN_FILE: C:/vcpkg/scripts/buildsystems/vcpkg.cmake
Expand All @@ -447,7 +454,7 @@ jobs:
- name: Build package 3.9
run: |
pip install build wheel
python -m build
python -m build -C build-dir="$GITHUB_WORKSPACE/build/{state}-{wheel_tag}"
shell: bash
env:
CMAKE_TOOLCHAIN_FILE: C:/vcpkg/scripts/buildsystems/vcpkg.cmake
Expand All @@ -460,7 +467,7 @@ jobs:
- name: Build package 3.10
run: |
pip install build wheel
python -m build
python -m build -C build-dir="$GITHUB_WORKSPACE/build/{state}-{wheel_tag}"
shell: bash
env:
CMAKE_TOOLCHAIN_FILE: C:/vcpkg/scripts/buildsystems/vcpkg.cmake
Expand All @@ -473,7 +480,7 @@ jobs:
- name: Build package 3.11
run: |
pip install build wheel
python -m build
python -m build -C build-dir="$GITHUB_WORKSPACE/build/{state}-{wheel_tag}"
shell: bash
env:
CMAKE_TOOLCHAIN_FILE: C:/vcpkg/scripts/buildsystems/vcpkg.cmake
Expand All @@ -486,7 +493,7 @@ jobs:
- name: Build package 3.12
run: |
pip install build wheel
python -m build
python -m build -C build-dir="$GITHUB_WORKSPACE/build/{state}-{wheel_tag}"
shell: bash
env:
CMAKE_TOOLCHAIN_FILE: C:/vcpkg/scripts/buildsystems/vcpkg.cmake
Expand All @@ -499,7 +506,7 @@ jobs:
- name: Build package 3.13
run: |
pip install build wheel
python -m build
python -m build -C build-dir="$GITHUB_WORKSPACE/build/{state}-{wheel_tag}"
shell: bash
env:
CMAKE_TOOLCHAIN_FILE: C:/vcpkg/scripts/buildsystems/vcpkg.cmake
Expand All @@ -512,7 +519,7 @@ jobs:
- name: Build package 3.14
run: |
pip install build wheel
python -m build
python -m build -C build-dir="$GITHUB_WORKSPACE/build/{state}-{wheel_tag}"
shell: bash
env:
CMAKE_TOOLCHAIN_FILE: C:/vcpkg/scripts/buildsystems/vcpkg.cmake
Expand All @@ -526,7 +533,7 @@ jobs:
- name: Build package 3.15
run: |
pip install build wheel
python -m build
python -m build -C build-dir="$GITHUB_WORKSPACE/build/{state}-{wheel_tag}"
shell: bash
env:
CMAKE_TOOLCHAIN_FILE: C:/vcpkg/scripts/buildsystems/vcpkg.cmake
Expand All @@ -547,10 +554,17 @@ jobs:

env:
VCPKG_DEFAULT_BINARY_CACHE: C:/vcpkg_binary_cache
CMAKE_GENERATOR: Ninja
CMAKE_TOOLCHAIN_FILE: C:/vcpkg/scripts/buildsystems/vcpkg.cmake

steps:
- uses: actions/checkout@v7

- name: Set up MSVC
uses: ilammy/msvc-dev-cmd@v1
with:
arch: amd64

- uses: actions/cache@v6
with:
path: |
Expand All @@ -563,7 +577,7 @@ jobs:

- name: Install packages
run: |
vcpkg install bzip2:x64-windows expat:x64-windows zlib:x64-windows lz4:x86-windows
vcpkg install bzip2:x64-windows expat:x64-windows zlib:x64-windows lz4:x64-windows
shell: bash

- name: Set up Python 3.13t
Expand All @@ -574,7 +588,7 @@ jobs:
- name: Build package 3.13t
run: |
pip install build wheel
python -m build
python -m build -C build-dir="$GITHUB_WORKSPACE/build/{state}-{wheel_tag}"
shell: bash
env:
CMAKE_TOOLCHAIN_FILE: C:/vcpkg/scripts/buildsystems/vcpkg.cmake
Expand All @@ -588,7 +602,7 @@ jobs:
- name: Build package 3.14t
run: |
pip install build wheel
python -m build
python -m build -C build-dir="$GITHUB_WORKSPACE/build/{state}-{wheel_tag}"
shell: bash
env:
CMAKE_TOOLCHAIN_FILE: C:/vcpkg/scripts/buildsystems/vcpkg.cmake
Expand Down Expand Up @@ -697,7 +711,7 @@ jobs:
shell: bash
env:
PYVER: ${{ matrix.python-version }}
if: matrix.python-version != '3.14t'
if: matrix.python-version != '3.13t'

- name: Install osmium (without shapely)
run: |
Expand All @@ -709,7 +723,7 @@ jobs:
shell: bash
env:
PYVER: ${{ matrix.python-version }}
if: matrix.python-version == '3.14t'
if: matrix.python-version == '3.13t'

- name: Run tests
run: |
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ pyosmium-up-to-date = "osmium.tools.pyosmium_up_to_date:main"
[tool.scikit-build]
minimum-version = "build-system.requires"
cmake.version = ">=3.15"
ninja.version = ">=1.11"
ninja.make-fallback = false

[tool.scikit-build.sdist]
cmake = true
Expand Down