From bc4d78360fb7be83ca8b1c8efcc42f1d46e5fc3d Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Sun, 30 Jul 2023 12:42:02 +0200 Subject: [PATCH] Try to enable windows --- .github/workflows/wheels.yml | 8 +++++--- pyproject.toml | 12 ++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index d27b398..1e64c3d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -70,7 +70,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v3 @@ -81,7 +81,8 @@ jobs: with: platforms: all - - uses: pypa/cibuildwheel@v2.14 + - name: Build wheels + uses: pypa/cibuildwheel@v2.14 if: ${{ github.event_name != 'pull_request' }} env: CIBW_ARCHS_LINUX: x86_64 @@ -89,7 +90,8 @@ jobs: CIBW_ARCHS_WINDOWS: AMD64 CIBW_PRERELEASE_PYTHONS: "1" - - uses: pypa/cibuildwheel@v2.14 + - name: Build wheels (PR) + uses: pypa/cibuildwheel@v2.14 if: ${{ github.event_name == 'pull_request' }} env: CIBW_ARCHS_LINUX: x86_64 diff --git a/pyproject.toml b/pyproject.toml index de3ac01..df30cf5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,22 +36,22 @@ testpaths = ["tests"] [tool.cibuildwheel] # Setuptools bug causes collision between pypy and cpython artifacts -before-build = [ +before-all = [ "rm -rf '{project}/build'", - "pip install 'conan>=2'", + "pip3 install conan==2", "conan profile detect --force", - 'cd {project}/devel/cibw/linux && ./cibw_setup_deps.sh' + "cd '{project}/devel/cibw/linux' && ./cibw_setup_deps.sh" ] environment = { CMAKE_ARGS = '-DCMAKE_PREFIX_PATH=/usr/local/share' } environment-pass = ["CMAKE_ARGS"] [tool.cibuildwheel.macos] # Setuptools bug causes collision between pypy and cpython artifacts -before-build = [ +before-all = [ "rm -rf '{project}/build'", - "pip install 'conan>=2'", + "pip3 install conan==2", "sudo conan profile detect --force", - 'cd {project}/devel/cibw/macos && sudo ./cibw_setup_deps.sh' + "cd '{project}/devel/cibw/macos' && sudo ./cibw_setup_deps.sh" ] environment = { CMAKE_ARGS = '-DCMAKE_PREFIX_PATH=/usr/local/share', MACOSX_DEPLOYMENT_TARGET = '10.15' }