Merge branch 'main' into quickfix/pyscript_loading_sequence

2026-04-30 16:00:32 -04:00 · 2022-05-03 09:04:03 -05:00
parent ede0adac81 b77b8caefb
commit f5a6a87328
12 changed files with 34 additions and 23 deletions
--- a/pyscriptjs/examples/antigravity.html
+++ b/pyscriptjs/examples/antigravity.html
@@ -8,7 +8,7 @@
  </head>
  <py-env>
 - paths:
-  - /antigravity.py
+  - ./antigravity.py
  </py-env>
  <body>
    <b>Based on xkcd: antigravity https://xkcd.com/353/.</b>
--- a/pyscriptjs/examples/numpy_canvas_fractals.html
+++ b/pyscriptjs/examples/numpy_canvas_fractals.html
@@ -66,7 +66,7 @@
              <input id="y1" type="text" value="5.0" style="width: 80px; text-align: right">
              <span style="white-space: pre">]</span>
            </div>
-            <div style="display: flex; flex-direaction: row; gap: 1em">
+            <div style="display: flex; flex-direction: row; gap: 1em">
              <div style="white-space: pre"><input type="radio" id="conv" name="type" value="convergence" checked> convergence</div>
              <div style="white-space: pre"><input type="radio" id="iter" name="type" value="iterations"> iterations</div>
            </div>
@@ -82,8 +82,8 @@
 - numpy
 - sympy
 - paths:
-  - /palettes.py
-  - /fractals.py
+  - ./palettes.py
+  - ./fractals.py
 </py-env>

 <py-script>
--- a/pyscriptjs/examples/panel_deckgl.html
+++ b/pyscriptjs/examples/panel_deckgl.html
@@ -6,9 +6,9 @@
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="apple-mobile-web-app-status-bar-style" content="default">
    <meta name="theme-color" content="#0072b5">
-    <meta name="name" content="Pyscript/Panel DeckGL Demo">
+    <meta name="name" content="PyScript/Panel DeckGL Demo">

-    <title>Pyscript/Panel DeckGL Demo</title>
+    <title>PyScript/Panel DeckGL Demo</title>
    <link rel="icon" type="image/x-icon" href="./favicon.png">

    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css" type="text/css" />
--- a/pyscriptjs/examples/repl.html
+++ b/pyscriptjs/examples/repl.html
@@ -13,7 +13,7 @@

  <py-env>
 - paths:
-  - /antigravity.py
+  - ./antigravity.py
  </py-env>

  <body>
--- a/pyscriptjs/examples/repl2.html
+++ b/pyscriptjs/examples/repl2.html
@@ -17,8 +17,8 @@
 - bokeh
 - numpy
 - paths:
-  - /utils.py
-  - /antigravity.py
+  - ./utils.py
+  - ./antigravity.py
  </py-env>

  <body>
--- a/pyscriptjs/examples/simple_clock.html
+++ b/pyscriptjs/examples/simple_clock.html
@@ -12,7 +12,7 @@
    <script defer src="../build/pyscript.js"></script>
    <py-env>
    - paths:
-      - /utils.py
+      - ./utils.py
    </py-env>
  </head>

--- a/pyscriptjs/examples/todo.html
+++ b/pyscriptjs/examples/todo.html
@@ -12,7 +12,7 @@
    <script defer src="/build/pyscript.js"></script>
    <py-env>
    - paths:
-      - /utils.py
+      - ./utils.py
    </py-env>
  </head>

--- a/pyscriptjs/src/components/pyenv.ts
+++ b/pyscriptjs/src/components/pyenv.ts
@@ -1,6 +1,6 @@
 import * as jsyaml from 'js-yaml';

-import { pyodideLoaded, loadedEnvironments, mode, addInitializer } from '../stores';
+import { pyodideLoaded, addInitializer } from '../stores';
 import { loadPackage, loadFromFile } from '../interpreter';

 // Premise used to connect to the first available pyodide interpreter
--- a/pyscriptjs/src/components/pytitle.ts
+++ b/pyscriptjs/src/components/pytitle.ts
@@ -1,5 +1,5 @@
 import { BaseEvalElement } from './base';
-import { addClasses, ltrim, htmlDecode } from '../utils';
+import { addClasses, htmlDecode } from '../utils';

 export class PyTitle extends BaseEvalElement {
    shadow: ShadowRoot;
--- a/pyscriptjs/src/pyscript.py
+++ b/pyscriptjs/src/pyscript.py
@@ -1,7 +1,6 @@
-from js import document, setInterval, console
-import micropip
+from js import document, console
 import asyncio
-import io, base64, sys
+import io, base64

 loop = asyncio.get_event_loop()