Skip to content

Commit 4afdbca

Browse files
committed
pyodide: remove outdated patching of emscripten
1 parent 6373771 commit 4afdbca

3 files changed

Lines changed: 4 additions & 32 deletions

File tree

‎.github/workflows/buildwheel.yml‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ permissions:
1010
contents: read
1111

1212
env:
13-
# These four values need to be kept in sync. Each pyodide version pins an
14-
# emscripten version and a CPython version.
13+
# These values need to be kept in sync. Each Pyodide version pins a CPython
14+
# version.
1515
PYODIDE_VERSION: '314.0.0'
16-
PYODIDE_EMSCRIPTEN_VERSION: '5.0.3'
1716
PYODIDE_PYTHON_VERSION: '3.14'
1817
PYODIDE_CIBW_BUILD: 'cp314-*'
1918

@@ -105,26 +104,6 @@ jobs:
105104
$pkgConfigPath = $pkgConfigPath.Replace('\', '/')
106105
echo "PKG_CONFIG_PATH=$pkgConfigPath" >> $env:GITHUB_ENV
107106
108-
# ------------- pyodide ------------- #
109-
110-
- if: ${{ matrix.kind == 'pyodide' }}
111-
name: Set up Emscripten toolchain
112-
uses: pyodide/setup-emsdk@ca2dd8aef8c2a0e11743c5c36f0b430ddb694b5c # v15
113-
with:
114-
version: ${{ env.PYODIDE_EMSCRIPTEN_VERSION }}
115-
actions-cache-folder: emsdk-cache
116-
117-
- if: ${{ matrix.kind == 'pyodide' }}
118-
name: Check out Emscripten patches for Pyodide
119-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
120-
with:
121-
repository: pyodide/pyodide
122-
ref: ${{ env.PYODIDE_VERSION }}
123-
path: pyodide-patches
124-
sparse-checkout: |
125-
emsdk/patches/
126-
persist-credentials: false
127-
128107
# ------------- actual build ------------- #
129108

130109
- name: Build wheels
@@ -183,7 +162,7 @@ jobs:
183162
macos-15,
184163
]
185164
# This list to be kept in sync with python-requires in pyproject.toml.
186-
python-version: ['3.11', '3.12', '3.13', '3.13t', '3.14', '3.14t', 'pypy3.11']
165+
python-version: ['3.11', '3.12', '3.13', '3.14', '3.14t', 'pypy3.11']
187166
exclude:
188167
- os: windows-11-arm
189168
python-version: pypy3.11

‎bin/cibw_before_build_pyodide.sh‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,3 @@
33
set -euo pipefail
44

55
python -m pip install wheel auditwheel_emscripten
6-
7-
EMSCRIPTEN_DIR="$HOME/.cache/cibuildwheel/emsdk-$PYODIDE_EMSCRIPTEN_VERSION/emsdk-$PYODIDE_EMSCRIPTEN_VERSION/upstream/emscripten"
8-
9-
for patch_file in pyodide-patches/emsdk/patches/*.patch; do
10-
echo "Applying Pyodide Emscripten patch $(basename "$patch_file")"
11-
patch -p1 --verbose -d "$EMSCRIPTEN_DIR" < "$patch_file"
12-
done

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ content-type = "text/markdown"
3232
# Minimum build requirements tested in CI need to be kept in sync with the
3333
# versions in requires below so that they are tested.
3434
#
35-
# To support the freethreaded build (CPython 3.13t) version 3.1.0 of Cython is
35+
# To support the freethreaded build (CPython 3.14t) version 3.1.0 of Cython is
3636
# needed as a minimum requirement. It is possible that future versions of
3737
# Cython might still work but typically a Cython release breaks something in
3838
# the build of python-flint so we include an upper bound here.

0 commit comments

Comments
 (0)