Skip to content

Commit 5ebd701

Browse files
committed
conflict
1 parent c8106e2 commit 5ebd701

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ const kernel: JupyterLiteServerPlugin<void> = {
5959
const disablePyPIFallback = !!config.disablePyPIFallback;
6060
const loadPyodideOptions = config.loadPyodideOptions || {};
6161
const extraPackagesAndIndexes = config.extraPackagesAndIndexes || [];
62-
console.log('extraPackagesAndIndexes', extraPackagesAndIndexes, config);
6362

6463
for (const [key, value] of Object.entries(loadPyodideOptions)) {
6564
if (key.endsWith('URL') && typeof value === 'string') {

packages/pyodide-kernel/src/worker.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ export class PyodideRemoteKernel {
105105
const { extraPackagesAndIndexes } = this._options as IPyodideWorkerKernel.IOptions;
106106
if (extraPackagesAndIndexes.length > 0) {
107107
// note that here pkg can be a package name or a wheel url
108-
for (let { packages: pkgs, indexes } of extraPackagesAndIndexes) {
108+
for (const { packages: pkgs, indexes } of extraPackagesAndIndexes) {
109109
let installCmd: string;
110110
if (indexes === null) {
111-
installCmd = `import micropip\nawait micropip.install(${JSON.stringify(pkgs)}, keep_going=True)`;
111+
installCmd = `await piplite.install(${JSON.stringify(pkgs)}, keep_going=True)`;
112112
} else {
113-
installCmd = `import micropip\nawait micropip.install(${JSON.stringify(pkgs)}, index_urls=${JSON.stringify(indexes)}, keep_going=True)`;
113+
installCmd = `await piplite.install(${JSON.stringify(pkgs)}, index_urls=${JSON.stringify(indexes)}, keep_going=True)`;
114114
}
115-
console.info('installCmd', installCmd);
115+
console.info('installing via cmd:', installCmd);
116116
try {
117117
await this._pyodide.runPythonAsync(installCmd);
118118
console.info(`Package ${pkgs} Installed successfully`);

0 commit comments

Comments
 (0)