Merge branch 'master' into 628-python-313

.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.2"
+  "image": "donkirkby/live-py-plugin-devcontainer-full:v1.3"
 }

.devcontainer/full/prebuild/Dockerfile

@@ -1,15 +1,15 @@
 # Find new docker tags at https://hub.docker.com/r/pyodide/pyodide-env/tags
-FROM pyodide/pyodide-env:20230612-chrome114-firefox114-py311@sha256:8bcb06afdf9c95599b51ac41e90d8c12eea92adac4c0b8932ab66f50d6bf1267 as pyodide
+FROM pyodide/pyodide-env:20240127-chrome114-firefox122-py312@sha256:44664c3dd2f33183f7f9c8fb07e4eefe77eee004725af10a40b809216ebb31bf as pyodide
 ENV PYODIDE_PACKAGES=core,matplotlib
-ENV PYODIDE_VERSION=0.24.1
+ENV PYODIDE_VERSION=0.26.0
 # 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' pyodide-build/pyodide_build/pyzip.py && \
+    sed -i '/^\s*turtle\.py\s*\\$/d' Makefile.envs && \
     make && \
     chown -R $CODESPACE_USER:$CODESPACE_USER .
 

README.md

@@ -24,7 +24,7 @@ even your browser.
 [openssf]: https://bestpractices.coreinfrastructure.org/projects/7182
 [PyCharm downloads]: https://img.shields.io/jetbrains/plugin/d/9742?label=PyCharm%20%E2%86%93
 [pycharm plugin]: https://plugins.jetbrains.com/plugin/9742
-[Emacs downloads]: https://img.shields.io/badge/Emacs%20%E2%86%93-377k-brightgreen
+[Emacs downloads]: https://img.shields.io/badge/Emacs%20%E2%86%93-432k-brightgreen
 [emacs plugin]: https://melpa.org/#/live-py-mode
 [Sublime downloads]: https://img.shields.io/packagecontrol/dt/Live%20Coding%20in%20Python?label=Sublime%20%E2%86%93
 [sublime plugin]: https://packagecontrol.io/packages/Live%20Coding%20in%20Python

contributing-browser-full.md

@@ -20,38 +20,38 @@ storage space than the browser tutorial environment on GitHub's codespaces.
        cd html
        ./serve.sh
 
-5. That should take a few seconds to generate the web pages, and then launch
+8. That should take a few seconds to generate the web pages, and then launch
    a web server on port 4000.
-6. You should see a pop up that asks if you want to open port 4000 in your
+9. You should see a pop up that asks if you want to open port 4000 in your
    browser. Click the "Open in Browser" button, and you should see a copy of the
    current web site.
-7. Switch back to the GitHub codespace tab, navigate to the
-   `plugin/PySrc/space_tracer` folder, and make some changes to the Python
-   source code. You can also change the unit tests under `test/PySrc/tests`.
-8. Stop the web server by clicking in the terminal and typing
-   <kbd>Ctrl</kbd>+<kbd>C</kbd>. Then run the tests by running `tox` in the
-   project's top directory.
+10. Switch back to the GitHub codespace tab, navigate to the
+    `plugin/PySrc/space_tracer` folder, and make some changes to the Python
+    source code. You can also change the unit tests under `test/PySrc/tests`.
+11. Stop the web server by clicking in the terminal and typing
+    <kbd>Ctrl</kbd>+<kbd>C</kbd>. Then run the tests by running `tox` in the
+    project's top directory.
 
-       cd ..
-       tox
+        cd ..
+        tox
 
-   Not all versions of Python are installed by default, so you can run the tests
-   in Python 3.10 with `tox -e py310`. You can install a missing Python version
-   with this:
+    Not all versions of Python are installed by default, so you can run the tests
+    in Python 3.10 with `tox -e py310`. You can install a missing Python version
+    with this:
 
-       sudo apt update
-       sudo apt install python3.9
+        sudo apt update
+        sudo apt install python3.9
 
-   For some versions of Python, you might have to register the [dead snakes]
-   package repository.
-9. Once the tests pass, you can deploy the new Python code on your local copy
-   of the web site.
+    For some versions of Python, you might have to register the [dead snakes]
+    package repository.
+12. Once the tests pass, you can deploy the new Python code on your local copy
+    of the web site.
 
-       cd html
-       npm run build
-       ./serve.sh
+        cd html
+        npm run build
+        ./serve.sh
 
-10. Go back to the browser tab with the web site, and refresh the page. You
+13. Go back to the browser tab with the web site, and refresh the page. You
     should see your changes.
 
 [dead snakes]: https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa
@@ -66,7 +66,7 @@ GitHub, and install Docker. After that, follow these steps for each release.
 
 1. Update the version number in `html/meta.yaml` and in the `srcFiles` list in
    `html/deploy.js`.
-2. Find the `remove_modules.txt` file in the pyodide project, and remove
+2. Find the `Makefile.envs` file in the pyodide project, and remove
    `turtle.py` from the list.
 3. Run `npm run build`. You should see a message that it rebuilt space tracer
    in pyodide.

contributing-pycharm.md

@@ -52,9 +52,10 @@ two types of IDEA release.
 2. Update the version number in `about.py` and `pycharm/build.gradle.kts`, and
     the change notes in `pycharm/src/main/resources/META-INF/plugin.xml`. Keep
     the version in sync with `html/meta.yaml`.
-3. Run the `runPluginVerifier` and `buildPlugin` Gradle tasks. You should get a
-   `livepy-X.Y.Z.zip` file for the new version under
-   `pycharm/build/distributions`.
+3. Run the `verifyPlugin` and `buildPlugin` Gradle tasks. Check that you're
+    verifying against the latest release, and that the `sinceBuild` matches
+    the oldest verified release. You should get a `livepy-X.Y.Z.zip` file for
+    the new version under `pycharm/build/distributions`.
 4. Install the new plugin zip file into your IntelliJ or PyCharm. Sometimes it
     behaves differently as a zip file. From the File menu, choose Settings....
 5. Navigate down to the plugins section, click on the gear icon at the top,