From 71916e2e4d03ade4f3e140de762765470457a209 Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Tue, 26 Nov 2024 16:33:52 +0000 Subject: [PATCH 01/10] ci: remove workaround for free-threaded build w. maturin --- .github/workflows/ci.yml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fcb4b7..5bee217 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -384,29 +384,10 @@ jobs: with: components: llvm-tools - # linux: builds are done inside manylinux docker images, need to help maturin-action - # find the right path - # - # TODO, would be nice to remove, see - # https://github.com/PyO3/maturin-action/issues/300 - - if: ${{ matrix.os == 'linux' }} - id: resolve-interpreter - name: resolve interpreter - run: | - echo python-path=/opt/python/$(python -c "print({ - '3.8': 'cp38-cp38', - '3.9': 'cp39-cp39', - '3.10': 'cp310-cp310', - '3.11': 'cp311-cp311', - '3.12': 'cp312-cp312', - '3.13': 'cp313-cp313', - '3.13t': 'cp313-cp313t', - }['${{ matrix.interpreter }}'])")/bin/python >> $GITHUB_OUTPUT - - name: build pgo wheel uses: ./.github/actions/build-pgo-wheel with: - interpreter: ${{ matrix.os == 'linux' && steps.resolve-interpreter.outputs.python-path || steps.setup-python.outputs.python-path }} + interpreter: ${{ matrix.interpreter }} rust-toolchain: ${{ steps.rust-toolchain.outputs.name }} - run: ${{ matrix.ls || 'ls -lh' }} crates/jiter-python/dist/ From 60b007c06c3e7360a2c947074b75dc1102408977 Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Tue, 26 Nov 2024 17:00:06 +0000 Subject: [PATCH 02/10] use `python3.13t` as interpreter in maturin build --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5bee217..c463ecd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -346,7 +346,7 @@ jobs: fail-fast: false matrix: os: [linux, windows, macos] - interpreter: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.13t"] + interpreter: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "python3.13t"] include: # standard runners with override for macos arm - os: linux From e4fce7926d29949a1f4af45230d43679b51f2e0b Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Tue, 26 Nov 2024 17:08:08 +0000 Subject: [PATCH 03/10] move workaround directly to maturin args --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c463ecd..123d540 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -346,7 +346,7 @@ jobs: fail-fast: false matrix: os: [linux, windows, macos] - interpreter: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "python3.13t"] + interpreter: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.13t"] include: # standard runners with override for macos arm - os: linux @@ -387,7 +387,7 @@ jobs: - name: build pgo wheel uses: ./.github/actions/build-pgo-wheel with: - interpreter: ${{ matrix.interpreter }} + interpreter: ${{ matrix.interpreter == '3.13t' && 'python3.13t' || matrix.interpreter }} rust-toolchain: ${{ steps.rust-toolchain.outputs.name }} - run: ${{ matrix.ls || 'ls -lh' }} crates/jiter-python/dist/ From 8463b25e4869dd7a63cb00db49299f12563dbee8 Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Tue, 26 Nov 2024 17:40:11 +0000 Subject: [PATCH 04/10] debug maturin (windows build failing to understand platform) --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 123d540..ac89baf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -389,6 +389,8 @@ jobs: with: interpreter: ${{ matrix.interpreter == '3.13t' && 'python3.13t' || matrix.interpreter }} rust-toolchain: ${{ steps.rust-toolchain.outputs.name }} + env: + RUST_LOG: maturin=debug - run: ${{ matrix.ls || 'ls -lh' }} crates/jiter-python/dist/ From fbee870dc23c2ce828abd0b57f959aba9c8888e9 Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Tue, 26 Nov 2024 22:00:52 +0000 Subject: [PATCH 05/10] Revert "skip Windows free-threaded wheel build for now (#173)" This reverts commit 2b67dd0d4cf06cb9c36e0e99654cb83b8d5fc391. --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac89baf..a8e3f5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -362,10 +362,6 @@ jobs: interpreter: "3.8" - os: macos interpreter: "3.9" - # windows free-threaded build has a problematic wheel name, - # needs something like https://github.com/PyO3/maturin/pull/2325 to fix - - os: windows - interpreter: "3.13t" runs-on: ${{ matrix.runs-on }} steps: From 2fd43cf961cf857b7673051a5f9b3a2969adec1e Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Tue, 26 Nov 2024 22:00:58 +0000 Subject: [PATCH 06/10] use git branch of maturin for testing --- crates/jiter-python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/jiter-python/pyproject.toml b/crates/jiter-python/pyproject.toml index 3239ec3..a4f7d20 100644 --- a/crates/jiter-python/pyproject.toml +++ b/crates/jiter-python/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["maturin>=1,<2"] +requires = ["maturin @ git+https://github.com/davidhewitt/maturin.git@windows-abiflags"] build-backend = "maturin" [project] From f4451ada8b90e37d029c418df16f8dfc30e991a1 Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Thu, 28 Nov 2024 09:43:26 +0000 Subject: [PATCH 07/10] remove interpreter workaround --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8e3f5a..087fc9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -383,7 +383,7 @@ jobs: - name: build pgo wheel uses: ./.github/actions/build-pgo-wheel with: - interpreter: ${{ matrix.interpreter == '3.13t' && 'python3.13t' || matrix.interpreter }} + interpreter: ${{ matrix.interpreter }} rust-toolchain: ${{ steps.rust-toolchain.outputs.name }} env: RUST_LOG: maturin=debug From afea1e9873899e7370f7421c0b9f7f2c443ec8a0 Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Thu, 28 Nov 2024 22:00:51 +0000 Subject: [PATCH 08/10] revert git maturin --- crates/jiter-python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/jiter-python/pyproject.toml b/crates/jiter-python/pyproject.toml index a4f7d20..3239ec3 100644 --- a/crates/jiter-python/pyproject.toml +++ b/crates/jiter-python/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["maturin @ git+https://github.com/davidhewitt/maturin.git@windows-abiflags"] +requires = ["maturin>=1,<2"] build-backend = "maturin" [project] From e1da8084c75f132e5f341e6b5b09dc686c80d360 Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Mon, 2 Dec 2024 15:31:17 +0000 Subject: [PATCH 09/10] disable twine for now --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 087fc9c..d50474b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -331,7 +331,9 @@ jobs: - run: | pip install -U twine - twine check --strict crates/jiter-python/dist/* + # FIXME: restore `twine` check when metadata version 2.4 (used by `maturin`) supported by `twine`, + # see https://github.com/pypa/twine/pull/1180 + # twine check --strict crates/jiter-python/dist/* - uses: actions/upload-artifact@v4 with: @@ -563,7 +565,9 @@ jobs: - run: pip install -U twine - run: ls -l dist/ - - run: twine check --strict dist/* + # FIXME: restore `twine` check when metadata version 2.4 (used by `maturin`) supported by `twine` + # see https://github.com/pypa/twine/pull/1180 + # - run: twine check --strict dist/* - name: upload to pypi uses: pypa/gh-action-pypi-publish@release/v1 From 8084e377a152e34b5c411eee332f36c40f37d485 Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Mon, 2 Dec 2024 16:40:08 +0000 Subject: [PATCH 10/10] remove maturin debug logging --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d50474b..15ef2d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -387,8 +387,6 @@ jobs: with: interpreter: ${{ matrix.interpreter }} rust-toolchain: ${{ steps.rust-toolchain.outputs.name }} - env: - RUST_LOG: maturin=debug - run: ${{ matrix.ls || 'ls -lh' }} crates/jiter-python/dist/