Close #564 by upgrading to Pyodide 0.24.

donkirkby · Oct 1, 2023 · 053ce5d · 053ce5d
1 parent a8c712d
commit 053ce5d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/.devcontainer/full/devcontainer.json b/.devcontainer/full/devcontainer.json
@@ -2,5 +2,5 @@
   "name": "live-py-plugin-full",
 
   // For contents, look in .devcontainer-prebuild/full
-  "image": "donkirkby/live-py-plugin-devcontainer-full:v1.1.1"
+  "image": "donkirkby/live-py-plugin-devcontainer-full:v1.2"
 }
diff --git a/.devcontainer/full/prebuild/.devcontainer.json b/.devcontainer/full/prebuild/.devcontainer.json
@@ -15,7 +15,7 @@
   // "forwardPorts": [],
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "cd html && npm install && cd ../docs && bundle install && ln -s /opt/pyodide /workspaces/pyodide",
+  "postCreateCommand": "cd html && npm install && cd ../docs && bundle install && sudo ln -sf /opt/pyodide /workspaces/",
 
   // Configure tool-specific properties.
   "customizations": {

diff --git a/.devcontainer/full/prebuild/Dockerfile b/.devcontainer/full/prebuild/Dockerfile
@@ -1,14 +1,15 @@
-FROM pyodide/pyodide-env:20221102-chrome107-firefox106 as pyodide
+# Find new docker tags at https://hub.docker.com/r/pyodide/pyodide-env/tags
+FROM pyodide/pyodide-env:20230612-chrome114-firefox114-py311 as pyodide
 ENV PYODIDE_PACKAGES=core,matplotlib
-ENV PYODIDE_VERSION=0.22.1
+ENV PYODIDE_VERSION=0.24.1
 # Make pyodide checkout accessible to codespace user in final image.
 ENV CODESPACE_USER=1000
 
 RUN cd /opt && \
     git clone https://github.com/pyodide/pyodide.git && \
     cd pyodide && \
     git checkout tags/$PYODIDE_VERSION && \
-    sed -i '/^turtle\.py$/d' cpython/remove_modules.txt && \
+    sed -i '/^ *"turtle\.py",$/d' pyodide-build/pyodide_build/pyzip.py && \
     make && \
     chown -R $CODESPACE_USER:$CODESPACE_USER .
 

diff --git a/html/deploy.js b/html/deploy.js
@@ -44,24 +44,23 @@ function copyPyodide(srcPath, destPath) {
     const srcFiles = [
         'cycler-0.11.0-py3-none-any.whl',
         'distutils-1.0.0.zip',
-        'fonttools-4.38.0-py3-none-any.whl',
-        'kiwisolver-1.4.4-cp310-cp310-emscripten_3_1_27_wasm32.whl',
-        'matplotlib-3.5.2-cp310-cp310-emscripten_3_1_27_wasm32.whl',
-        'matplotlib_pyodide-0.1.1-py3-none-any.whl',
-        'numpy-1.23.5-cp310-cp310-emscripten_3_1_27_wasm32.whl',
-        'packaging-21.3-py3-none-any.whl',
-        'PIL-9.1.1-cp310-cp310-emscripten_3_1_27_wasm32.whl',
+        'fonttools-4.42.1-py3-none-any.whl',
+        'kiwisolver-1.4.4-cp311-cp311-emscripten_3_1_45_wasm32.whl',
+        'matplotlib-3.5.2-cp311-cp311-emscripten_3_1_45_wasm32.whl',
+        'matplotlib_pyodide-0.2.0-py3-none-any.whl',
+        'numpy-1.25.2-cp311-cp311-emscripten_3_1_45_wasm32.whl',
+        'packaging-23.1-py3-none-any.whl',
+        'Pillow-10.0.0-cp311-cp311-emscripten_3_1_45_wasm32.whl',
         'pyodide.js',
         'pyodide.js.map',
         'pyodide.asm.wasm',
         'pyodide.asm.js',
-        'pyodide.asm.data',
-        'pyodide_py.tar',
-        'pyparsing-3.0.9-py3-none-any.whl',
+        'pyodide-lock.json',
+        'pyparsing-3.1.1-py3-none-any.whl',
         'python_dateutil-2.8.2-py2.py3-none-any.whl',
-        'pytz-2022.7-py2.py3-none-any.whl',
+        'python_stdlib.zip',
+        'pytz-2023.3-py2.py3-none-any.whl',
         'package.json',
-        'repodata.json',
         'six-1.16.0-py2.py3-none-any.whl',
         'space_tracer-4.10.2-py3-none-any.whl'];
     fs.mkdirSync(destPath);