Skip to content

Commit 6ca2872

Browse files
committed
Cumulative update for Polyscript:
* updated MicroPython interpreter to its latest (not preview) * updated Pyodide to its latest * fixed an issue with `lockFileURL` [as suggested](pyodide/pyodide#5135) * added manual test for the lockFileURL story
1 parent 252702f commit 6ca2872

File tree

14 files changed

+213
-243
lines changed

14 files changed

+213
-243
lines changed

docs/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/toml-DiUM0_qs.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/zip-Bf48tRr5.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esm/interpreter/micropython.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const progress = createProgress('mpy');
2525

2626
export default {
2727
type,
28-
module: (version = '1.24.0-preview-114') =>
28+
module: (version = '1.24.0') =>
2929
`https://cdn.jsdelivr.net/npm/@micropython/micropython-webassembly-pyscript@${version}/micropython.mjs`,
3030
async engine({ loadMicroPython }, config, url, baseURL) {
3131
const { stderr, stdout, get } = stdio({

esm/interpreter/pyodide.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const progress = createProgress('py');
8181

8282
export default {
8383
type,
84-
module: (version = '0.26.2') =>
84+
module: (version = '0.26.3') =>
8585
`https://cdn.jsdelivr.net/pyodide/v${version}/full/pyodide.mjs`,
8686
async engine({ loadPyodide }, config, url, baseURL) {
8787
// apply override ASAP then load foreign code
@@ -110,8 +110,10 @@ export default {
110110
);
111111
// this should be used to bootstrap loadPyodide
112112
options.lockFileURL = URL.createObjectURL(blob);
113-
// no need to use micropip manually here
114-
options.packages = packages;
113+
// versions are not currently understood by pyodide when
114+
// a lockFileURL is used instead of micropip.install(packages)
115+
// https://github.com/pyodide/pyodide/issues/5135#issuecomment-2441038644
116+
options.packages = packages.map(name => name.split('==')[0]);
115117
packages = null;
116118
}
117119
}

node.importmap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"imports": {
33
"http://pyodide": "./test/mocked/pyodide.mjs",
4-
"https://cdn.jsdelivr.net/pyodide/v0.26.2/full/pyodide.mjs": "./test/mocked/pyodide.mjs",
5-
"https://cdn.jsdelivr.net/npm/@micropython/[email protected]-preview-114/micropython.mjs": "./test/mocked/micropython.mjs",
4+
"https://cdn.jsdelivr.net/pyodide/v0.26.3/full/pyodide.mjs": "./test/mocked/pyodide.mjs",
5+
"https://cdn.jsdelivr.net/npm/@micropython/[email protected]/micropython.mjs": "./test/mocked/micropython.mjs",
66
"./3rd-party/toml.js": "./test/mocked/toml.mjs"
77
}
88
}

0 commit comments

Comments
 (0)