Skip to content

Commit c897472

Browse files
authored
Merge pull request #2547 from tomjakubowski/pyodide-0.25.0
Update Pyodide to version 0.25.0
2 parents a9477f2 + 89ea124 commit c897472

File tree

2 files changed

+3
-121
lines changed

2 files changed

+3
-121
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,14 +1186,13 @@ jobs:
11861186
runs-on: ${{ matrix.os }}
11871187
needs: [initialize]
11881188
env:
1189-
# NOTA BENE: When upgrading past 0.24.1, remove workaround below for https://github.com/pyodide/pyodide/issues/4216
1190-
PYODIDE_VERSION: 0.24.1
1189+
PYODIDE_VERSION: 0.25.0
11911190
# PYTHON_VERSION and EMSCRIPTEN_VERSION are determined by PYODIDE_VERSION.
11921191
# The appropriate versions can be found in the Pyodide repodata.json
11931192
# "info" field, or in Makefile.envs:
1194-
# https://github.com/pyodide/pyodide/blob/main/Makefile.envs#L2
1193+
# https://github.com/pyodide/pyodide/blob/0.25.0/Makefile.envs#L2
11951194
PYTHON_VERSION: 3.11.3
1196-
EMSCRIPTEN_VERSION: 3.1.45
1195+
EMSCRIPTEN_VERSION: 3.1.46
11971196
steps:
11981197
- name: Checkout perspective
11991198
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
@@ -1221,16 +1220,6 @@ jobs:
12211220
- name: Install pyodide-build
12221221
run: pip install pyodide-build==$PYODIDE_VERSION "pydantic<2"
12231222

1224-
# NOTA BENE: When removing this step, also remove the vendored pyodide file
1225-
- name: Provision workaround for bug in Pyodide 0.24.1
1226-
run: |
1227-
PYTHON_HOME="$(python -c 'import sys; print(sys.prefix)')"
1228-
TOOLCHAIN_DIR="$PYTHON_HOME/lib/python3.11/site-packages/pyodide_build/tools/cmake/Modules/Platform"
1229-
echo "$PYTHON_HOME"
1230-
echo "$TOOLCHAIN_DIR"
1231-
mkdir -p "$TOOLCHAIN_DIR"
1232-
cp vendor/pyodide/Emscripten.cmake "$TOOLCHAIN_DIR"
1233-
12341223
- name: Build
12351224
# Without --exports=pyinit, pyodide-build tries to export all symbols from every .o,
12361225
# which causes the em++ linker command line invocation to be so long

vendor/pyodide/Emscripten.cmake

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)