Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Pyodide to version 0.25.0 #2547

Merged
merged 2 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1133,14 +1133,13 @@ jobs:
runs-on: ${{ matrix.os }}
needs: [initialize]
env:
# NOTA BENE: When upgrading past 0.24.1, remove workaround below for https://github.com/pyodide/pyodide/issues/4216
PYODIDE_VERSION: 0.24.1
PYODIDE_VERSION: 0.25.0
# PYTHON_VERSION and EMSCRIPTEN_VERSION are determined by PYODIDE_VERSION.
# The appropriate versions can be found in the Pyodide repodata.json
# "info" field, or in Makefile.envs:
# https://github.com/pyodide/pyodide/blob/main/Makefile.envs#L2
# https://github.com/pyodide/pyodide/blob/0.25.0/Makefile.envs#L2
PYTHON_VERSION: 3.11.3
EMSCRIPTEN_VERSION: 3.1.45
EMSCRIPTEN_VERSION: 3.1.46
steps:
- name: Checkout perspective
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
Expand Down Expand Up @@ -1168,16 +1167,6 @@ jobs:
- name: Install pyodide-build
run: pip install pyodide-build==$PYODIDE_VERSION "pydantic<2"

# NOTA BENE: When removing this step, also remove the vendored pyodide file
- name: Provision workaround for bug in Pyodide 0.24.1
run: |
PYTHON_HOME="$(python -c 'import sys; print(sys.prefix)')"
TOOLCHAIN_DIR="$PYTHON_HOME/lib/python3.11/site-packages/pyodide_build/tools/cmake/Modules/Platform"
echo "$PYTHON_HOME"
echo "$TOOLCHAIN_DIR"
mkdir -p "$TOOLCHAIN_DIR"
cp vendor/pyodide/Emscripten.cmake "$TOOLCHAIN_DIR"

- name: Build
# Without --exports=pyinit, pyodide-build tries to export all symbols from every .o,
# which causes the em++ linker command line invocation to be so long
Expand Down
107 changes: 0 additions & 107 deletions vendor/pyodide/Emscripten.cmake

This file was deleted.

Loading