Merge pull request #124 from pyscript/index_urls

Add index_urls parsing for Pyodide
pyscript · Oct 29, 2024 · 3505e21 · 3505e21
2 parents 4a9e039 + dc96dae
commit 3505e21
Show file tree

Hide file tree

Showing 12 changed files with 172 additions and 122 deletions.
diff --git a/docs/index.js b/docs/index.js
diff --git a/docs/index.js.map b/docs/index.js.map
diff --git a/docs/zip-Bf48tRr5.js b/docs/zip-Bf48tRr5.js
diff --git a/docs/zip-Bf48tRr5.js.map b/docs/zip-Bf48tRr5.js.map
diff --git a/docs/zip-CFEEYRfx.js b/docs/zip-CFEEYRfx.js
diff --git a/docs/zip-CFEEYRfx.js.map b/docs/zip-CFEEYRfx.js.map
diff --git a/esm/interpreter/pyodide.js b/esm/interpreter/pyodide.js
@@ -78,6 +78,7 @@ const applyOverride = () => {
 };
 
 const progress = createProgress('py');
+const indexURLs = new WeakMap();
 
 export default {
     type,
@@ -88,7 +89,7 @@ export default {
         if (!RUNNING_IN_WORKER && config.experimental_create_proxy === 'auto')
             applyOverride();
         progress('Loading Pyodide');
-        let { packages } = config;
+        let { packages, index_urls } = config;
         progress('Loading Storage');
         const indexURL = url.slice(0, url.lastIndexOf('/'));
         // each pyodide version shares its own cache
@@ -123,6 +124,7 @@ export default {
             loadPyodide({ stderr, stdout, ...options }),
         );
         const py_imports = importPackages.bind(interpreter);
+        if (index_urls) indexURLs.set(interpreter, index_urls);
         loader.set(interpreter, py_imports);
         await loadProgress(this, progress, interpreter, config, baseURL);
         // if cache wasn't know, import and freeze it for the next time
@@ -176,6 +178,7 @@ async function importPackages(packages, storage, save = false) {
     console.log = _log;
     await this.loadPackage('micropip');
     const micropip = this.pyimport('micropip');
+    if (indexURLs.has(this)) micropip.set_index_urls(indexURLs.get(this));
     await micropip.install(packages, { keep_going: true });
     console.log = log;
     if (save && (storage instanceof IDBMapSync)) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
         "@playwright/test": "^1.48.2",
         "@rollup/plugin-node-resolve": "^15.3.0",
         "@rollup/plugin-terser": "^0.4.4",
-        "@zip.js/zip.js": "^2.7.52",
+        "@zip.js/zip.js": "^2.7.53",
         "c8": "^10.1.2",
         "chokidar": "^4.0.1",
         "eslint": "^9.13.0",
@@ -88,6 +88,6 @@
         "to-json-callback": "^0.1.1"
     },
     "worker": {
-        "blob": "sha256-52erKRHjBwcn2bnRpQFvjQxkigDMnQm/sOQdyX/Bc08="
+        "blob": "sha256-q3F8S0fpbtQrs9PkgOIbLQeYahmzu3z2eABsNHH1zMo="
     }
 }
diff --git a/test/integration.html b/test/integration.html
@@ -5,5 +5,5 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <title>polyscript integration tests</title>
     </head>
-    <body><ul><li><strong>micropython</strong><ul><li><a href="/test/integration/interpreter/micropython/bootstrap.html">bootstrap</a></li><li><a href="/test/integration/interpreter/micropython/config-json.html">config-json</a></li><li><a href="/test/integration/interpreter/micropython/config-object.html">config-object</a></li><li><a href="/test/integration/interpreter/micropython/current-script.html">current-script</a></li><li><a href="/test/integration/interpreter/micropython/custom-hooks.html">custom-hooks</a></li><li><a href="/test/integration/interpreter/micropython/fetch.html">fetch</a></li><li><a href="/test/integration/interpreter/micropython/interpreter-local.html">interpreter-local</a></li><li><a href="/test/integration/interpreter/micropython/mip.html">mip</a></li><li><a href="/test/integration/interpreter/micropython/no-type.html">no-type</a></li><li><a href="/test/integration/interpreter/micropython/ready-done.html">ready-done</a></li><li><a href="/test/integration/interpreter/micropython/storage.html">storage</a></li><li><a href="/test/integration/interpreter/micropython/worker-attribute.html">worker-attribute</a></li><li><a href="/test/integration/interpreter/micropython/worker-bad.html">worker-bad</a></li><li><a href="/test/integration/interpreter/micropython/worker-empty-attribute.html">worker-empty-attribute</a></li><li><a href="/test/integration/interpreter/micropython/worker-error.html">worker-error</a></li><li><a href="/test/integration/interpreter/micropython/worker-lua.html">worker-lua</a></li><li><a href="/test/integration/interpreter/micropython/worker-tag.html">worker-tag</a></li><li><a href="/test/integration/interpreter/micropython/worker-window.html">worker-window</a></li><li><a href="/test/integration/interpreter/micropython/worker.html">worker</a></li><li><a href="/test/integration/interpreter/micropython/workers.html">workers</a></li></ul><li><strong>pyodide</strong><ul><li><a href="/test/integration/interpreter/pyodide/bootstrap.html">bootstrap</a></li><li><a href="/test/integration/interpreter/pyodide/button.html">button</a></li><li><a href="/test/integration/interpreter/pyodide/config-json.html">config-json</a></li><li><a href="/test/integration/interpreter/pyodide/fetch.html">fetch</a></li><li><a href="/test/integration/interpreter/pyodide/sync.html">sync</a></li><li><a href="/test/integration/interpreter/pyodide/worker-error.html">worker-error</a></li><li><a href="/test/integration/interpreter/pyodide/worker-transform.html">worker-transform</a></li><li><a href="/test/integration/interpreter/pyodide/worker.html">worker</a></li></ul><li><strong>ruby-wasm-wasi</strong><ul><li><a href="/test/integration/interpreter/ruby-wasm-wasi/bootstrap.html">bootstrap</a></li></ul><li><strong>wasmoon</strong><ul><li><a href="/test/integration/interpreter/wasmoon/bootstrap.html">bootstrap</a></li><li><a href="/test/integration/interpreter/wasmoon/worker.html">worker</a></li></ul><li><strong>webr</strong><ul><li><a href="/test/integration/interpreter/webr/just-click.html">just-click</a></li></ul></ul></body>
+    <body><ul><li><strong>micropython</strong><ul><li><a href="/test/integration/interpreter/micropython/bootstrap.html">bootstrap</a></li><li><a href="/test/integration/interpreter/micropython/config-json.html">config-json</a></li><li><a href="/test/integration/interpreter/micropython/config-object.html">config-object</a></li><li><a href="/test/integration/interpreter/micropython/current-script.html">current-script</a></li><li><a href="/test/integration/interpreter/micropython/custom-hooks.html">custom-hooks</a></li><li><a href="/test/integration/interpreter/micropython/fetch.html">fetch</a></li><li><a href="/test/integration/interpreter/micropython/interpreter-local.html">interpreter-local</a></li><li><a href="/test/integration/interpreter/micropython/mip.html">mip</a></li><li><a href="/test/integration/interpreter/micropython/no-type.html">no-type</a></li><li><a href="/test/integration/interpreter/micropython/ready-done.html">ready-done</a></li><li><a href="/test/integration/interpreter/micropython/storage.html">storage</a></li><li><a href="/test/integration/interpreter/micropython/worker-attribute.html">worker-attribute</a></li><li><a href="/test/integration/interpreter/micropython/worker-bad.html">worker-bad</a></li><li><a href="/test/integration/interpreter/micropython/worker-empty-attribute.html">worker-empty-attribute</a></li><li><a href="/test/integration/interpreter/micropython/worker-error.html">worker-error</a></li><li><a href="/test/integration/interpreter/micropython/worker-lua.html">worker-lua</a></li><li><a href="/test/integration/interpreter/micropython/worker-tag.html">worker-tag</a></li><li><a href="/test/integration/interpreter/micropython/worker-window.html">worker-window</a></li><li><a href="/test/integration/interpreter/micropython/worker.html">worker</a></li><li><a href="/test/integration/interpreter/micropython/workers.html">workers</a></li></ul><li><strong>pyodide</strong><ul><li><a href="/test/integration/interpreter/pyodide/bootstrap.html">bootstrap</a></li><li><a href="/test/integration/interpreter/pyodide/button.html">button</a></li><li><a href="/test/integration/interpreter/pyodide/config-json.html">config-json</a></li><li><a href="/test/integration/interpreter/pyodide/fetch.html">fetch</a></li><li><a href="/test/integration/interpreter/pyodide/index_urls.html">index_urls</a></li><li><a href="/test/integration/interpreter/pyodide/sync.html">sync</a></li><li><a href="/test/integration/interpreter/pyodide/worker-error.html">worker-error</a></li><li><a href="/test/integration/interpreter/pyodide/worker-transform.html">worker-transform</a></li><li><a href="/test/integration/interpreter/pyodide/worker.html">worker</a></li></ul><li><strong>ruby-wasm-wasi</strong><ul><li><a href="/test/integration/interpreter/ruby-wasm-wasi/bootstrap.html">bootstrap</a></li></ul><li><strong>wasmoon</strong><ul><li><a href="/test/integration/interpreter/wasmoon/bootstrap.html">bootstrap</a></li><li><a href="/test/integration/interpreter/wasmoon/worker.html">worker</a></li></ul><li><strong>webr</strong><ul><li><a href="/test/integration/interpreter/webr/just-click.html">just-click</a></li></ul></ul></body>
 </html>
diff --git a/test/integration/interpreter/pyodide/index_urls.html b/test/integration/interpreter/pyodide/index_urls.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <script type="module">
+            import { init } from '../utils.js';
+            init('pyodide');
+        </script>
+    </head>
+    <body>
+        <script type="pyodide" config='{"packages":["test_foo"],"index_urls":["https://test.pypi.org/simple"]}'>
+            import js
+            import test_foo
+            js.document.documentElement.classList.add(test_foo.__name__)
+        </script>
+    </body>
+</html>
diff --git a/test/integration/pyodide.js b/test/integration/pyodide.js
@@ -33,4 +33,9 @@ export default (playwright, baseURL) => {
     test('Pyodide transform', python.error(playwright, baseURL));
 
     test('Pyodide events ready', python.disabledUntilReady(playwright, baseURL));
+
+    test('Pyodide index_urls', async ({ page }) => {
+        await page.goto(`${baseURL}/index_urls.html`);
+        await page.waitForSelector('html.test_foo');
+    });
 };