Merge pull request #2547 from tomjakubowski/pyodide-0.25.0

Update Pyodide to version 0.25.0
finos · Mar 12, 2024 · c897472 · c897472
2 parents a9477f2 + 89ea124
commit c897472
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 121 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1186,14 +1186,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
@@ -1221,16 +1220,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

diff --git a/vendor/pyodide/Emscripten.cmake b/vendor/pyodide/Emscripten.cmake