diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5eb0ff92..cc3e5f83 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -529,28 +529,28 @@ jobs: name: Build PyOdide wheel runs-on: ubuntu-22.04 timeout-minutes: 30 + strategy: + fail-fast: false + matrix: + include: + - build: "cp313-*" + toolchain: nightly-2025-02-01 + - build: "cp314-*" + toolchain: 1.93.0 steps: - uses: actions/checkout@v7 - - uses: dtolnay/rust-toolchain@nightly + - uses: dtolnay/rust-toolchain@stable with: - # Nightly 1.86 as 1.87+ is incompatible with PyOdide as of now - toolchain: nightly-2025-02-01 + toolchain: ${{ matrix.toolchain }} targets: wasm32-unknown-emscripten components: rust-src - - uses: actions/setup-python@v7 + - uses: pypa/cibuildwheel@v4.1.0 with: - python-version: 3.13 - - run: | - pip install pyodide-build>=0.28.0 - echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version) >> $GITHUB_ENV - - uses: mymindstorm/setup-emsdk@v16 - with: - version: ${{ env.EMSCRIPTEN_VERSION }} - - run: pyodide build - working-directory: ./bindings/python + package-dir: ./bindings/python env: - DEFAULT_CROSS_BUILD_ENV_URL: "https://github.com/pyodide/pyodide/releases/download/0.28.0a3/xbuildenv-0.28.0a3.tar.bz2" - RUSTFLAGS: "-C link-arg=-sSIDE_MODULE=2 -Z link-native-libraries=no -Z emscripten-wasm-eh" + CIBW_PLATFORM: pyodide + CIBW_BUILD: ${{ matrix.build }} + CIBW_ENABLE: pyodide-eol test-php: strategy: diff --git a/.github/workflows/python-release.yml b/.github/workflows/python-release.yml index d44bdbc2..0685fecf 100644 --- a/.github/workflows/python-release.yml +++ b/.github/workflows/python-release.yml @@ -289,32 +289,33 @@ jobs: pyodide: runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + include: + - build: "cp313-*" + toolchain: nightly-2025-02-01 + - build: "cp314-*" + toolchain: 1.93.0 steps: - uses: actions/checkout@v7 - - uses: dtolnay/rust-toolchain@nightly + - uses: dtolnay/rust-toolchain@stable with: - # Nightly 1.86 as 1.87+ is incompatible with PyOdide as of now - toolchain: nightly-2025-02-01 + toolchain: ${{ matrix.toolchain }} targets: wasm32-unknown-emscripten components: rust-src - - uses: actions/setup-python@v7 - with: - python-version: 3.13 - - run: | - pip install pyodide-build>=0.28.0 - echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version) >> $GITHUB_ENV - - uses: mymindstorm/setup-emsdk@v16 + - uses: pypa/cibuildwheel@v4.1.0 with: - version: ${{ env.EMSCRIPTEN_VERSION }} - - run: pyodide build - working-directory: ./bindings/python + package-dir: ./bindings/python + output-dir: ./bindings/python/dist env: - DEFAULT_CROSS_BUILD_ENV_URL: "https://github.com/pyodide/pyodide/releases/download/0.28.0a3/xbuildenv-0.28.0a3.tar.bz2" - RUSTFLAGS: "-C link-arg=-sSIDE_MODULE=2 -Z link-native-libraries=no -Z emscripten-wasm-eh" + CIBW_PLATFORM: pyodide + CIBW_BUILD: ${{ matrix.build }} + CIBW_ENABLE: pyodide-eol - name: Upload wheels uses: actions/upload-artifact@v7 with: - name: wheel-pyodide + name: wheel-pyodide-${{ matrix.build }} if-no-files-found: error path: ./bindings/python/dist diff --git a/bindings/python/CHANGELOG.md b/bindings/python/CHANGELOG.md index 6697ba82..5a5300a6 100644 --- a/bindings/python/CHANGELOG.md +++ b/bindings/python/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased] +### Added + +- Pyodide 3.14 wheels for the `pyemscripten_2026_0` platform. [#786](https://github.com/Stranger6667/css-inline/issues/786) + ## [0.21.2] - 2026-08-24 ### Fixed diff --git a/bindings/python/pyproject.toml b/bindings/python/pyproject.toml index d1ff357f..ab20a5c9 100644 --- a/bindings/python/pyproject.toml +++ b/bindings/python/pyproject.toml @@ -49,6 +49,3 @@ build-backend = "maturin" [tool.maturin] strip = true - -[tool.pyodide.build] -default_cross_build_env_url = "https://github.com/pyodide/pyodide/releases/download/0.28.0a3/xbuildenv-0.28.0a3.tar.bz2"