From 07dfbe3d3915838372086dc7697750c7eba64934 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 31 Jan 2024 17:08:51 -0500 Subject: [PATCH 01/12] use M1 to build macosx_universal2 --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7654f37..3c5c9a6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,10 +21,10 @@ jobs: python: 37 platform_id: manylinux_x86_64 # macos-x86-64 - - os: macos-latest + - os: macos-13 python: 37 platform_id: macosx_x86_64 - - os: macos-latest + - os: macos-14 python: 38 platform_id: macosx_universal2 # win-64 From caaec4767e0caf6c625672b9f80cdb78b9a40f2c Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 31 Jan 2024 17:12:46 -0500 Subject: [PATCH 02/12] bump cibuildwheel to 2.16 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3c5c9a6..f0481ad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build wheels - uses: pypa/cibuildwheel@v2.14.1 + uses: pypa/cibuildwheel@v2.16 env: CIBW_ARCHS: all CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }} From 2f36c98de6093727a5375a0fefb8658a1c66fd66 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 31 Jan 2024 17:23:59 -0500 Subject: [PATCH 03/12] install pipx --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index dcd1f26..91c8823 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -79,6 +79,7 @@ repair-wheel-command = [ ] [tool.cibuildwheel.macos] +before-all = "pip install pipx" repair-wheel-command = [ "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}", "pipx run abi3audit --strict --report {wheel}", From 8badffa36a285ca557ca21e54c1e4c556b857c89 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 31 Jan 2024 17:28:20 -0500 Subject: [PATCH 04/12] pipx --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 91c8823..2581919 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -79,10 +79,9 @@ repair-wheel-command = [ ] [tool.cibuildwheel.macos] -before-all = "pip install pipx" repair-wheel-command = [ "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}", - "pipx run abi3audit --strict --report {wheel}", + "python -m pipx run abi3audit --strict --report {wheel}", ] [tool.ruff] From 2ed3047cfbf68c0f37bb788081a8f00822301949 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 31 Jan 2024 17:31:12 -0500 Subject: [PATCH 05/12] pipx --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2581919..67106ad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -81,7 +81,7 @@ repair-wheel-command = [ [tool.cibuildwheel.macos] repair-wheel-command = [ "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}", - "python -m pipx run abi3audit --strict --report {wheel}", + "python -m pip install pipx && python -m pipx run abi3audit --strict --report {wheel}", ] [tool.ruff] From cae3382464d4c436a439cd12a13f6cdd03c35625 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Wed, 31 Jan 2024 18:10:17 -0500 Subject: [PATCH 06/12] fix pipx --- .github/workflows/release.yml | 9 +++++++++ pyproject.toml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f0481ad..bfcb11b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,12 +27,21 @@ jobs: - os: macos-14 python: 38 platform_id: macosx_universal2 + - os: macos-14 + python: 39 + platform_id: macosx_universal2 # win-64 - os: windows-2019 python: 37 platform_id: win_amd64 steps: - uses: actions/checkout@v3 + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + if: matrix.os == 'macos-14' + - run: pip install pipx + if: matrix.os == 'macos-14' - name: Build wheels uses: pypa/cibuildwheel@v2.16 env: diff --git a/pyproject.toml b/pyproject.toml index 67106ad..dcd1f26 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -81,7 +81,7 @@ repair-wheel-command = [ [tool.cibuildwheel.macos] repair-wheel-command = [ "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}", - "python -m pip install pipx && python -m pipx run abi3audit --strict --report {wheel}", + "pipx run abi3audit --strict --report {wheel}", ] [tool.ruff] From 1e0ae8cdfb2037bec6fca8e1df35121cc4ed380c Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Thu, 1 Feb 2024 16:46:06 -0500 Subject: [PATCH 07/12] test https://github.com/njzjz/cibuildwheel/commit/a78facb861c2169ad7b47a4aa1b1dae0d1c75d3a --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bfcb11b..722442b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: - run: pip install pipx if: matrix.os == 'macos-14' - name: Build wheels - uses: pypa/cibuildwheel@v2.16 + uses: njzjz/cibuildwheel@a78facb861c2169ad7b47a4aa1b1dae0d1c75d3a env: CIBW_ARCHS: all CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }} From afa6884765b58ab571c39ac5ad423552e4193fb8 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 23 Mar 2024 21:07:26 -0400 Subject: [PATCH 08/12] bump cibuildwheel to v2.17 --- .github/workflows/release.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 722442b..d913095 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,23 +27,14 @@ jobs: - os: macos-14 python: 38 platform_id: macosx_universal2 - - os: macos-14 - python: 39 - platform_id: macosx_universal2 # win-64 - os: windows-2019 python: 37 platform_id: win_amd64 steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v5 - with: - python-version: '3.12' - if: matrix.os == 'macos-14' - - run: pip install pipx - if: matrix.os == 'macos-14' - name: Build wheels - uses: njzjz/cibuildwheel@a78facb861c2169ad7b47a4aa1b1dae0d1c75d3a + uses: pypa/cibuildwheel@v2.17 env: CIBW_ARCHS: all CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }} From 6d8f35a1e30576671718c2a104c5640dee73f49d Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 20 Apr 2024 19:39:58 -0400 Subject: [PATCH 09/12] remove macos_x86_64, considering it has been contained in universal2 --- .github/workflows/release.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d913095..3ec2faa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,10 +20,7 @@ jobs: - os: ubuntu-latest python: 37 platform_id: manylinux_x86_64 - # macos-x86-64 - - os: macos-13 - python: 37 - platform_id: macosx_x86_64 + # macosx_universal2 - os: macos-14 python: 38 platform_id: macosx_universal2 From 57f64a4b0ccdc4904477f0e33ee854a323767d18 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 20 Apr 2024 19:55:36 -0400 Subject: [PATCH 10/12] bump macos to py39 Signed-off-by: Jinzhe Zeng --- .github/workflows/release.yml | 2 +- pyproject.toml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ec2faa..3ed222b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: platform_id: manylinux_x86_64 # macosx_universal2 - os: macos-14 - python: 38 + python: 39 platform_id: macosx_universal2 # win-64 - os: windows-2019 diff --git a/pyproject.toml b/pyproject.toml index dcd1f26..2583a23 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ fallback_version = "Unknown" test-command = "datasetbuilder -h" build = ["cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*"] skip = ["*-win32", "*-manylinux_i686", "*-musllinux*"] -test-skip = "*-win_amd64 cp311-*" +test-skip = "*-win_amd64" [tool.cibuildwheel.linux] environment-pass = ["CIBW_BUILD"] @@ -84,6 +84,9 @@ repair-wheel-command = [ "pipx run abi3audit --strict --report {wheel}", ] +[tool.cibuildwheel.windows] +repair-wheel-command = "pipx run abi3audit --strict --report {wheel}" + [tool.ruff] select = [ "E", # errors From 4209a4042c5d550acce5d5e029fefe20b58163b7 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 20 Apr 2024 21:18:50 -0400 Subject: [PATCH 11/12] Revert "bump macos to py39" This reverts commit 57f64a4b0ccdc4904477f0e33ee854a323767d18. --- .github/workflows/release.yml | 2 +- pyproject.toml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ed222b..3ec2faa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: platform_id: manylinux_x86_64 # macosx_universal2 - os: macos-14 - python: 39 + python: 38 platform_id: macosx_universal2 # win-64 - os: windows-2019 diff --git a/pyproject.toml b/pyproject.toml index 2583a23..dcd1f26 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ fallback_version = "Unknown" test-command = "datasetbuilder -h" build = ["cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*"] skip = ["*-win32", "*-manylinux_i686", "*-musllinux*"] -test-skip = "*-win_amd64" +test-skip = "*-win_amd64 cp311-*" [tool.cibuildwheel.linux] environment-pass = ["CIBW_BUILD"] @@ -84,9 +84,6 @@ repair-wheel-command = [ "pipx run abi3audit --strict --report {wheel}", ] -[tool.cibuildwheel.windows] -repair-wheel-command = "pipx run abi3audit --strict --report {wheel}" - [tool.ruff] select = [ "E", # errors From abd7aab5c592041d9b6f02dfcd7eb5a69c66d7ae Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 20 Apr 2024 21:19:07 -0400 Subject: [PATCH 12/12] bump macos to py39 Signed-off-by: Jinzhe Zeng --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ec2faa..3ed222b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: platform_id: manylinux_x86_64 # macosx_universal2 - os: macos-14 - python: 38 + python: 39 platform_id: macosx_universal2 # win-64 - os: windows-2019