update to pyodide 0.28.3 (#223)

* update to pyodide 0.28.3

* update pyproject.toml options, test pyodide constants

Author: bollwyvl

examples/jupyter-lite.json

@@ -6,7 +6,7 @@
       "@jupyterlite/pyodide-kernel-extension:kernel": {
         "loadPyodideOptions": {
           "packages": ["matplotlib", "micropip", "numpy", "sqlite3", "ssl"],
-          "lockFileURL": "https://cdn.jsdelivr.net/pyodide/v0.28.1/full/pyodide-lock.json?from-lite-config=1"
+          "lockFileURL": "https://cdn.jsdelivr.net/pyodide/v0.28.3/full/pyodide-lock.json?from-lite-config=1"
         }
       }
     }

jupyterlite_pyodide_kernel/constants.py

@@ -29,7 +29,7 @@
 PYODIDE_URL_ENV_VAR = "JUPYTERLITE_PYODIDE_URL"
 
 #: probably only compatible with this version of pyodide
-PYODIDE_VERSION = "0.28.1"
+PYODIDE_VERSION = "0.28.3"
 
 #: the only kind of noarch wheel piplite understands
 NOARCH_WHL = "py3-none-any.whl"

jupyterlite_pyodide_kernel/tests/test_metadata.py

@@ -1,6 +1,35 @@
+from pathlib import Path
+
 import jupyterlite_pyodide_kernel
+from jupyterlite_pyodide_kernel.constants import PYODIDE_VERSION
+
+import pytest
+import re
+
+RE_CDN_ROOT = r"https://cdn.jsdelivr.net/pyodide/v(.*)/full"
+RE_CDN_JS_URL = rf"{RE_CDN_ROOT}/pyodide.js"
+
+VERSION_PATH_PATTERNS = {
+    "packages/pyodide-kernel/package.json": r"\"pyodide\": \"(.*)\"",
+    "examples/jupyter-lite.json": rf"{RE_CDN_ROOT}/pyodide-lock.json",
+    "packages/pyodide-kernel-extension/src/index.ts": RE_CDN_JS_URL,
+    "packages/pyodide-kernel-extension/schema/kernel.v0.schema.json": RE_CDN_JS_URL,
+}
 
 
 def test_labextension_meta():
     paths = jupyterlite_pyodide_kernel._jupyter_labextension_paths()
     assert len(paths) == 1
+
+
+@pytest.mark.parametrize("repo_path", sorted(VERSION_PATH_PATTERNS))
+def test_pyodide_versions(repo_path):
+    path = Path(repo_path)
+    if not path.exists():
+        pytest.skip("not in full repo checkout")
+
+    text = path.read_text(encoding="utf-8")
+    pattern = VERSION_PATH_PATTERNS[repo_path]
+    version = re.search(pattern, text)
+    assert version, f"no version of pyodide found in {repo_path}: {pattern}"
+    assert version[1] == PYODIDE_VERSION, f"unexpected pyodide version in {repo_path}"

packages/pyodide-kernel-extension/schema/kernel.v0.schema.json

@@ -8,7 +8,7 @@
     "pyodideUrl": {
       "description": "The path to the main pyodide.js entry point",
       "type": "string",
-      "default": "https://cdn.jsdelivr.net/pyodide/v0.28.1/full/pyodide.js",
+      "default": "https://cdn.jsdelivr.net/pyodide/v0.28.3/full/pyodide.js",
       "format": "uri"
     },
     "disablePyPIFallback": {

packages/pyodide-kernel-extension/src/index.ts

@@ -20,7 +20,7 @@ const KERNEL_ICON_URL = `data:image/svg+xml;base64,${btoa(KERNEL_ICON_SVG_STR)}`
 /**
  * The default CDN fallback for Pyodide
  */
-const PYODIDE_CDN_URL = 'https://cdn.jsdelivr.net/pyodide/v0.28.1/full/pyodide.js';
+const PYODIDE_CDN_URL = 'https://cdn.jsdelivr.net/pyodide/v0.28.3/full/pyodide.js';
 
 /**
  * The id for the extension, and key in the litePlugins.

packages/pyodide-kernel/package.json

@@ -60,7 +60,7 @@
   "devDependencies": {
     "@babel/core": "^7.22.17",
     "esbuild": "^0.19.2",
-    "pyodide": "0.28.1",
+    "pyodide": "0.28.3",
     "rimraf": "^6.0.1",
     "typescript": "~5.2.2"
   },

pyproject.toml

@@ -68,7 +68,7 @@ lint = [
 
 test = [
     "pytest-console-scripts >=1.4.0",
-    "pytest-cov",
+    "pytest-cov <7",
     "pytest-html",
     "pytest",
 ]
@@ -97,11 +97,11 @@ exclude = [
     "/jupyterlite_pyodide_kernel/tests/fixtures/.pyodide"
 ]
 include = [
+    "/*.md",
+    "/install.json",
     "/jupyterlite_pyodide_kernel",
     "/package.json",
-    "/install.json",
     "/ts*.json",
-    "/*.md"
 ]
 
 [tool.hatch.build.targets.wheel]
@@ -113,25 +113,6 @@ include = [
 "jupyterlite_pyodide_kernel/labextension" = "share/jupyter/labextensions/@jupyterlite/pyodide-kernel-extension"
 "install.json" = "share/jupyter/labextensions/@jupyterlite/pyodide-kernel-extension/install.json"
 
-[tool.pytest.ini_options]
-addopts = [
-    "--pyargs",
-    "jupyterlite_pyodide_kernel",
-    "-vv",
-    # asyncio
-    "--script-launch-mode=subprocess",
-    # cov
-    "--cov=jupyterlite_pyodide_kernel",
-    "--cov-report=term-missing:skip-covered",
-    "--cov-report=html:build/reports/htmlcov",
-    "--cov-branch",
-    "--cov-fail-under=95",
-    "--no-cov-on-fail",
-    # html
-    "--html=build/reports/pytest.html",
-    "--self-contained-html",
-]
-
 [tool.jupyter-releaser.options]
 version_cmd = "python scripts/bump-version.py"
 
@@ -151,9 +132,37 @@ before-build-python = [
     "jlpm build:prod",
 ]
 
+# non-build tools, sorted by name
 [tool.check-wheel-contents]
 ignore = ["W002"]
 
+[tool.coverage.paths]
+source = [
+    "jupyterlite_pyodide_kernel/",
+    "*/site-packages/jupyterlite_pyodide_kernel/"
+]
+
+[tool.pytest.ini_options]
+addopts = [
+    "--pyargs",
+    "jupyterlite_pyodide_kernel",
+    "-vv",
+    "--tb=long",
+    "--color=yes",
+    # pytest-console-scripts
+    "--script-launch-mode=subprocess",
+    # cov
+    "--cov=jupyterlite_pyodide_kernel",
+    "--cov-report=term-missing:skip-covered",
+    "--cov-report=html:build/reports/htmlcov",
+    "--cov-branch",
+    "--cov-fail-under=95",
+    "--no-cov-on-fail",
+    # html
+    "--html=build/reports/pytest.html",
+    "--self-contained-html",
+]
+
 [tool.ruff]
 cache-dir = "build/.cache/ruff"
 extend-include = ["*.ipynb"]

yarn.lock

@@ -1113,7 +1113,7 @@ __metadata:
     coincident: ^1.2.3
     comlink: ^4.4.2
     esbuild: ^0.19.2
-    pyodide: 0.28.1
+    pyodide: 0.28.3
     rimraf: ^6.0.1
     typescript: ~5.2.2
   languageName: unknown
@@ -7607,12 +7607,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pyodide@npm:0.28.1":
-  version: 0.28.1
-  resolution: "pyodide@npm:0.28.1"
+"pyodide@npm:0.28.3":
+  version: 0.28.3
+  resolution: "pyodide@npm:0.28.3"
   dependencies:
     ws: ^8.5.0
-  checksum: a84604aaf2a0f9e01475c77b58a9cacadf49b42d8f4ab34f8165754a9a954e8b9c7c3bdeaf3977a26652c9b19be47d13467ef82be21d7228a4e6edfd09da5a76
+  checksum: bc58b0fd539102b9610d399e9d0ea28f095384766d3ebc995d59c1de06922f946adb78f298a37744a65e4e7bbfde08c61f9884ed85bb541efafcb8e453b901c1
   languageName: node
   linkType: hard