From 894a4fa76d5bd2b2899cf2a0c6590cf1f7d1bea7 Mon Sep 17 00:00:00 2001 From: nilsnolde Date: Thu, 2 May 2024 18:07:18 +0200 Subject: [PATCH] try with newer boost --- .github/workflows/publish_tags.yml | 2 +- .github/workflows/pull_request.yml | 10 +++++++++- conanfile.txt | 2 +- pyproject.toml | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish_tags.yml b/.github/workflows/publish_tags.yml index 2800822..e26f524 100644 --- a/.github/workflows/publish_tags.yml +++ b/.github/workflows/publish_tags.yml @@ -19,7 +19,7 @@ jobs: platform: linux - image: windows-latest platform: windows - - image: macos-latest + - image: macos-14 platform: macos steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e1657f4..712d37f 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -17,10 +17,18 @@ on: jobs: build_wheels: name: PR - cp*, ubuntu-latest - runs-on: ubuntu-latest + runs-on: macos-14 steps: - uses: actions/checkout@v4 + - name: Install Conan (MacOS) + run: | + pip install pip --upgrade + pip install "conan<2.0.0" + conan profile new default --detect + conan config set "storage.path=${{ github.workspace }}/conan_data" + conan install --install-folder ${{ github.workspace }}/conan_build --remote conancenter . + - name: Lint & Style Check run: | python -m pip install -r dev-requirements.txt diff --git a/conanfile.txt b/conanfile.txt index 89d6961..11fa494 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,5 @@ [requires] -boost/1.71.0 +boost/1.83.0 [generators] json diff --git a/pyproject.toml b/pyproject.toml index fa2315e..0a30be2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,7 @@ archs = "native" manylinux-x86_64-image = "ghcr.io/gis-ops/manylinux:2_28_valhalla_python" [tool.cibuildwheel.windows] -before-all = "pip install conan delvewheel" +before-all = "pip install conan<2.0.0 delvewheel" repair-wheel-command = "delvewheel repair --add-path lib/windows {wheel} -w {dest_dir}" [tool.cibuildwheel.linux]