From a2522dbba95334aedbe7fc8b4f0314fff7119b6d Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Mon, 1 Jul 2024 13:20:49 +0200 Subject: [PATCH 1/4] bump macos --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 5e676d2f88..93f27e6234 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-2019, macos-11] + os: [ubuntu-20.04, windows-2019, macos-14] steps: - uses: actions/checkout@v3 From d597f95d60a4146f6329b77d785a82b278695623 Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Mon, 1 Jul 2024 13:28:53 +0200 Subject: [PATCH 2/4] rust targets on macos --- .github/workflows/wheels.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 93f27e6234..4fea5f4743 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -38,6 +38,11 @@ jobs: - uses: actions/setup-python@v3 + - name: Install rust toolchains + if: startsWith(matrix.os, 'macOS') + run: rustup target install x86_64-apple-darwin aarch64-apple-darwin + + - name: Install cibuildwheel run: python -m pip install cibuildwheel From db8f078dfd520fd37ab06571af7f922a5d2651ec Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Tue, 2 Jul 2024 09:17:29 +0200 Subject: [PATCH 3/4] tweak retry rules --- .github/workflows/wheels.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 4fea5f4743..5fc3da586d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -41,7 +41,6 @@ jobs: - name: Install rust toolchains if: startsWith(matrix.os, 'macOS') run: rustup target install x86_64-apple-darwin aarch64-apple-darwin - - name: Install cibuildwheel run: python -m pip install cibuildwheel @@ -49,8 +48,8 @@ jobs: - name: Build wheels uses: nick-fields/retry@v2 with: - max_attempts: 3 - timeout_seconds: 36000 # 10 hours :/ + max_attempts: 2 + timeout_seconds: 54000 # 15 hours :/ command: python -m cibuildwheel --output-dir wheelhouse api/py - uses: actions/upload-artifact@v3 From 0eea42a42cf5a7c87dbd1336d819e888a2859e7f Mon Sep 17 00:00:00 2001 From: Mathieu Poumeyrol Date: Wed, 3 Jul 2024 08:53:15 +0200 Subject: [PATCH 4/4] skip pp* on macos --- api/py/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/api/py/pyproject.toml b/api/py/pyproject.toml index a7e5950834..7a02fc66a5 100644 --- a/api/py/pyproject.toml +++ b/api/py/pyproject.toml @@ -32,6 +32,7 @@ RUSTC_WRAPPER=sccache [tool.cibuildwheel.macos] archs = "x86_64 universal2 arm64" +skip = "pp*" before-build = """ python -m ensurepip --upgrade pip install "numpy<2" --config-settings=setup-args="-Dallow-noblas=true"