From 1a931ddfd9b4c71f5efc5e0f1a0674f5ab2a5198 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Fri, 7 Aug 2026 20:04:46 +0500 Subject: [PATCH] Revert "build_pyodide: try more recent `pyodide-build`" This reverts commit f7876a97eeb5e208c61345da0fd7698279b386b5. There's some emscripten mismatch, will try to bump it later. --- pyodide/build_pyodide.sh | 10 +++++----- pyodide/requirements.txt | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 pyodide/requirements.txt diff --git a/pyodide/build_pyodide.sh b/pyodide/build_pyodide.sh index 63a5617864..f8d8538767 100755 --- a/pyodide/build_pyodide.sh +++ b/pyodide/build_pyodide.sh @@ -2,7 +2,9 @@ set -ex PYODIDE_VERSION=0.29.3 -SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) +PYODIDE_BUILD_VERSION=0.33.0 +PYODIDE_XBUILDENV_ROOT="${HOME}/.cache/.pyodide-xbuildenv-${PYODIDE_BUILD_VERSION}" +PYODIDE_XBUILDENV="${PYODIDE_XBUILDENV_ROOT}/${PYODIDE_VERSION}" # Script is assuming that it will be possible to execute it multiple times # therefore we're clearing venv each time and ignoring existing 'emsdk' folder. @@ -14,14 +16,12 @@ source .venv/bin/activate # Install pyodide cross build environment. # Instructions: https://pyodide.org/en/stable/development/building-packages.html -uv pip install -r "${SCRIPT_DIR}/requirements.txt" +uv pip install "pyodide-build==${PYODIDE_BUILD_VERSION}" # `uv run` is required, so xbuildenv would skip using `pip`. uv run pyodide xbuildenv install "${PYODIDE_VERSION}" uv run pyodide xbuildenv install-emscripten -# Cache path includes a hash segment that varies by pyodide-build version, -# so query it instead of constructing it manually. -EMSDK_ROOT=$(uv run pyodide config get emsdk_dir) +EMSDK_ROOT="${PYODIDE_XBUILDENV}/emsdk" [ -f "${EMSDK_ROOT}/emsdk_env.sh" ] && source "${EMSDK_ROOT}/emsdk_env.sh" [ -f "${EMSDK_ROOT}/../../emsdk_env.sh" ] && source "${EMSDK_ROOT}/../../emsdk_env.sh" which emcc diff --git a/pyodide/requirements.txt b/pyodide/requirements.txt deleted file mode 100644 index efa200e7e5..0000000000 --- a/pyodide/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -pyodide-build==0.39.0