Update Pyodide to 0.26.0 (#934)

* Update Pyodide to 0.26.0

* Set Python version as 3.12.1

* Set Python version in packages/kernel/py/stlite-server/pyproject.toml

* Update .gitignore

* Specify engines.node in desktop/package.json and remove node-fetch

* Fix the Python version in gh-pages.yml

* Fix worker-runtime to handle LiteralMap, which was introduced in Pyodide 0.26.0

.github/workflows/gh-pages.yml

@@ -22,7 +22,7 @@ jobs:
         target: ["mountable"]
 
     env:
-      python-version: "3.11.2"
+      python-version: "3.12.1"
       # To avoid an error like "FATAL ERROR: Reached heap limit Allocation failed - JavaScript heap out of memory".
       # See https://github.com/actions/virtual-environments/issues/70#issuecomment-653886422
       # The Linux VM has 7GB RAM (https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources),

.github/workflows/main.yml

@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 env:
-  python-version: "3.11.2"
+  python-version: "3.12.1"
   # To avoid an error like "FATAL ERROR: Reached heap limit Allocation failed - JavaScript heap out of memory".
   # See https://github.com/actions/virtual-environments/issues/70#issuecomment-653886422
   # The Linux VM has 7GB RAM (https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources),

.gitignore

@@ -297,6 +297,7 @@ tags
 
 ### Others
 .pyodide-xbuildenv/
+.pyodide-xbuildenv-*/
 
 # sed backup files on macOS
 *.*-e

Makefile

@@ -8,7 +8,7 @@ desktop := packages/desktop/build/*
 kernel := packages/kernel/dist/*
 stlite-server-wheel := packages/kernel/py/stlite-server/dist/stlite_server-0.1.0-py3-none-any.whl
 streamlit_proto := streamlit/frontend/lib/src/proto.d.ts
-streamlit_wheel := packages/kernel/py/streamlit/lib/dist/streamlit-1.35.0-cp311-none-any.whl
+streamlit_wheel := packages/kernel/py/streamlit/lib/dist/streamlit-1.35.0-cp312-none-any.whl
 streamlit_frontend_lib_prod := streamlit/frontend/lib/dist/*
 
 .PHONY: all

packages/desktop/bin-src/dump_artifacts/index.ts

@@ -5,7 +5,6 @@ import { hideBin } from "yargs/helpers";
 import path from "node:path";
 import fsPromises from "node:fs/promises";
 import fsExtra from "fs-extra";
-import fetch from "node-fetch";
 import { loadPyodide, type PyodideInterface } from "pyodide";
 import { makePyodideUrl } from "./url";
 import { PrebuiltPackagesData } from "./pyodide_packages";
@@ -15,9 +14,6 @@ import { validateRequirements, parseRequirementsTxt } from "@stlite/common";
 import { glob } from "glob";
 import { logger } from "./logger";
 
-// @ts-ignore
-global.fetch = fetch; // The global `fetch()` is necessary for micropip.install() to load the remote packages.
-
 const pathFromScriptToBuild =
   process.env.PATH_FROM_SCRIPT_TO_BUILD ?? "../../build";
 const pathFromScriptToWheels =
@@ -141,7 +137,7 @@ async function installPackages(
   requirements.push(stliteServerWheel);
   const streamlitWheel = await prepareLocalWheel(
     pyodide,
-    path.join(wheelsDir, "streamlit-1.35.0-cp311-none-any.whl")
+    path.join(wheelsDir, "streamlit-1.35.0-cp312-none-any.whl")
   );
   requirements.push(streamlitWheel);
 

packages/desktop/bin-src/dump_artifacts/pyodide_packages.ts

@@ -1,4 +1,3 @@
-import fetch from "node-fetch";
 import { makePyodideUrl } from "./url";
 import { logger } from "./logger";
 

packages/desktop/package.json

@@ -11,6 +11,9 @@
     "url": "https://github.com/whitphx/stlite/issues"
   },
   "homepage": "/",
+  "engines": {
+    "node": ">=18"
+  },
   "main": "./build/electron/main.js",
   "files": [
     "build",
@@ -28,7 +31,7 @@
     "eject": "craco eject",
     "start:electron": "tsc -p electron && cross-env NODE_ENV=development concurrently \"./scripts/build_electron.js --watch\" \"electron .\"",
     "build:electron": "tsc -p electron && cross-env NODE_ENV=production ./scripts/build_electron.js",
-    "build:pyodide": "curl -L https://github.com/pyodide/pyodide/releases/download/0.25.1/pyodide-core-0.25.1.tar.bz2 | tar xj -C ./build --files-from=./pyodide-files.txt",
+    "build:pyodide": "curl -L https://github.com/pyodide/pyodide/releases/download/0.26.0/pyodide-core-0.26.0.tar.bz2 | tar xj -C ./build --files-from=./pyodide-files.txt",
     "build:bin": "tsc -p bin-src && ./scripts/build_bin.js",
     "build:wheels": "./scripts/copy_wheels.js",
     "typecheck": "yarn tsc --noEmit -p electron",
@@ -62,8 +65,7 @@
   "//": "The packages not bundled with bin/dump_artifacts.js must be specified here as the runtime dependencies. See `scripts/build_bin.js` for the details.",
   "dependencies": {
     "fs-extra": "^11.2.0",
-    "node-fetch": "2",
-    "pyodide": "0.25.1",
+    "pyodide": "0.26.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
@@ -76,7 +78,6 @@
     "@testing-library/user-event": "^14.0.0",
     "@types/jest": "^27.4.3",
     "@types/node": "^16.18.12",
-    "@types/node-fetch": "^2.6.11",
     "@types/react": "^17.0.7",
     "@types/react-dom": "^17.0.5",
     "@types/yargs": "^17.0.32",

packages/desktop/scripts/build_bin.js

@@ -16,7 +16,6 @@ require("esbuild")
     platform: "node",
     external: [
       "pyodide", // The `pyodide` package must be installed at runtime for the included Wasm files, so there is no reason to bundle it here.
-      "node-fetch", // `node-fetch` will be installed at runtime anyway because it is one dependency of the `pyodide` package, so there is no reason to bundle it here.
       "fs-extra", // `fs-extra` and `yargs` will be installed at runtime anyway as the dependencies of `electron-builder`, so we don't have to bundle them here.
       "yargs", // Same as above, `fs-extra`.
     ],

packages/desktop/scripts/copy_wheels.js

@@ -22,7 +22,7 @@ async function main() {
   );
   const streamlitWheelPath = path.join(
     stliteKernelPyDir,
-    "streamlit/lib/dist/streamlit-1.35.0-cp311-none-any.whl"
+    "streamlit/lib/dist/streamlit-1.35.0-cp312-none-any.whl"
   );
 
   // Create the `wheels` directory

packages/kernel/package.json

@@ -27,7 +27,7 @@
     "eslint": "^8.33.0",
     "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "pyodide": "0.25.1",
+    "pyodide": "0.26.0",
     "typescript": "^4.9.4",
     "vitest": "^1.2.2"
   },