From d72f177be0c9da39830ebca4c64c539e2a7bebb7 Mon Sep 17 00:00:00 2001
From: Alex Hall <alex.mojaki@gmail.com>
Date: Wed, 2 Aug 2023 20:15:53 +0200
Subject: [PATCH] Upgrade to Pyodide 0.23.4 (with Python 3.11) and compile
 dependencies (#603)

* Build packages with latest pyodide, compile wheels to use pyc files, output package_filenames.json
---
 sandbox/pyodide/build_packages.sh      |  8 +++++---
 sandbox/pyodide/package_filenames.json | 21 +++++++++++++++++++++
 sandbox/pyodide/packages.js            |  2 ++
 sandbox/pyodide/setup.sh               |  2 +-
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 sandbox/pyodide/package_filenames.json

diff --git a/sandbox/pyodide/build_packages.sh b/sandbox/pyodide/build_packages.sh
index 2354c831..4cd96b73 100644
--- a/sandbox/pyodide/build_packages.sh
+++ b/sandbox/pyodide/build_packages.sh
@@ -17,14 +17,16 @@ echo "###############################################################"
 echo "## Prepare python packages"
 
 cd _build/pyodide
+git checkout 0.23.4 || (git fetch && git checkout 0.23.4)
 ./run_docker make
 cp ../../../requirements3.txt .
-./run_docker pyodide build -r requirements3.txt --output-lockfile result.txt
-cat result.txt
+./run_docker "source emsdk/emsdk/emsdk_env.sh && pyodide build -r requirements3.txt --outdir grist-packages"
+./run_docker pyodide py-compile grist-packages
 cd ../..
 
 echo ""
 echo "###############################################################"
 echo "## Copy out python packages"
 
-node ./packages.js _build/pyodide/dist/ _build/packages/
+rm -rf _build/packages/
+node ./packages.js _build/pyodide/grist-packages/ _build/packages/
diff --git a/sandbox/pyodide/package_filenames.json b/sandbox/pyodide/package_filenames.json
new file mode 100644
index 00000000..00d88167
--- /dev/null
+++ b/sandbox/pyodide/package_filenames.json
@@ -0,0 +1,21 @@
+[
+  "astroid-2.14.2-cp311-none-any.whl",
+  "asttokens-2.2.1-cp311-none-any.whl",
+  "chardet-4.0.0-cp311-none-any.whl",
+  "et_xmlfile-1.0.1-cp311-none-any.whl",
+  "executing-1.1.1-cp311-none-any.whl",
+  "friendly_traceback-0.7.48-cp311-none-any.whl",
+  "iso8601-0.1.12-cp311-none-any.whl",
+  "lazy_object_proxy-1.6.0-cp311-cp311-emscripten_3_1_32_wasm32.whl",
+  "openpyxl-3.0.10-cp311-none-any.whl",
+  "phonenumberslite-8.12.57-cp311-none-any.whl",
+  "pure_eval-0.2.2-cp311-none-any.whl",
+  "python_dateutil-2.8.2-cp311-none-any.whl",
+  "roman-3.3-cp311-none-any.whl",
+  "six-1.16.0-cp311-none-any.whl",
+  "sortedcontainers-2.4.0-cp311-none-any.whl",
+  "stack_data-0.5.1-cp311-none-any.whl",
+  "typing_extensions-4.4.0-cp311-none-any.whl",
+  "unittest_xml_reporting-2.0.0-cp311-none-any.whl",
+  "wrapt-1.15.0-cp311-none-any.whl"
+]
\ No newline at end of file
diff --git a/sandbox/pyodide/packages.js b/sandbox/pyodide/packages.js
index fa0f03c6..bc13726e 100644
--- a/sandbox/pyodide/packages.js
+++ b/sandbox/pyodide/packages.js
@@ -61,6 +61,8 @@ async function findOnDisk(src, dest) {
     });
   }
   libs = await listLibs(dest);
+  fs.writeFileSync(path.join(__dirname, `package_filenames.json`),
+    JSON.stringify(libs.available.map(lib => lib.fileName), null, 2));
   console.log(`Cached`, {libs: libs.available.map(lib => lib.name)});
   console.log(`Missing`, {libs: libs.misses.map(lib => lib.name)});
 }
diff --git a/sandbox/pyodide/setup.sh b/sandbox/pyodide/setup.sh
index ce28cdc8..238ed9c5 100755
--- a/sandbox/pyodide/setup.sh
+++ b/sandbox/pyodide/setup.sh
@@ -10,6 +10,6 @@ if [[ ! -e _build/worker ]]; then
   mkdir -p _build/worker
   cd _build/worker
   yarn init --yes
-  yarn add pyodide@0.22.1
+  yarn add pyodide@0.23.4
   cd ../..
 fi