jprdonnelly/pyscript
1
0
Fork 0
mirror of https://github.com/pyscript/pyscript.git synced 2026-04-04 20:00:24 -04:00
Code Issues Projects Releases Wiki Activity

Upgrade Pyodide to v0.22.1 (#1144)

Browse Source 
* upgrade to pyodide 0.22.1

* pin bokeh in panel examples

* fix typo

* fix tests by using custom bokeh wheel

* fix bokeh interactive test

* adhere to new loadPackage API
This commit is contained in:
Madhur Tandon
2023-02-08 22:01:51 +05:30
committed by GitHub
parent 4c30359b71
commit 9a908e5fd0
13 changed files with 673 additions and 2189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pyscriptjs/src/pyconfig.ts
View File

@@ -53,8 +53,8 @@ export const defaultConfig: AppConfig = {
type: 'app',
interpreters: [
{
src: 'https://cdn.jsdelivr.net/pyodide/v0.21.3/full/pyodide.js',
name: 'pyodide-0.21.3',
src: 'https://cdn.jsdelivr.net/pyodide/v0.22.1/full/pyodide.js',
name: 'pyodide-0.22.1',
lang: 'python',
},
],

15
pyscriptjs/src/pyodide.ts
View File

@@ -28,7 +28,7 @@ export class PyodideInterpreter extends Interpreter {
constructor(
config: AppConfig,
stdio: Stdio,
src = 'https://cdn.jsdelivr.net/pyodide/v0.21.3/full/pyodide.js',
src = 'https://cdn.jsdelivr.net/pyodide/v0.22.1/full/pyodide.js',
name = 'pyodide-default',
lang = 'python',
) {
@@ -78,6 +78,7 @@ export class PyodideInterpreter extends Interpreter {
await this.loadPackage('micropip');
}
logger.info('pyodide loaded and initialized');
this.run('print("Python initialization complete")')
}
run(code: string): unknown {
@@ -90,7 +91,17 @@ export class PyodideInterpreter extends Interpreter {
async loadPackage(names: string | string[]): Promise<void> {
logger.info(`pyodide.loadPackage: ${names.toString()}`);
await this.interface.loadPackage(names, logger.info.bind(logger), logger.info.bind(logger));
// the new way in v0.22.1 is to pass it as a dict of options i.e.
// { messageCallback: logger.info.bind(logger), errorCallback: logger.info.bind(logger) }
// but one of our tests tries to use a locally downloaded older version of pyodide
// for which the signature of `loadPackage` accepts the above params as args i.e.
// the call uses `logger.info.bind(logger), logger.info.bind(logger)`.
if (this.run("import sys; sys.modules['pyodide'].__version__").toString().startsWith("0.22")) {
await this.interface.loadPackage(names, { messageCallback: logger.info.bind(logger), errorCallback: logger.info.bind(logger) });
}
else {
await this.interface.loadPackage(names, logger.info.bind(logger), logger.info.bind(logger));
}
}
async installPackage(package_name: string | string[]): Promise<void> {