Add and run trailing-whitespace

mattkram · mattkram · commit 3d6eac701cf8 · 2022-05-05T22:52:50.000-05:00
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,14 +1,19 @@
 name: Lint
 
 on:
-  push:
-    branches: main
-  pull_request:
-    branches: '*'
+
+  push: # Only run on merges into master that modify files under pyscriptjs/
+    branches:
+      - main
+
+  pull_request: # Run on any PR that modifies files in pyscriptjs/
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./pyscriptjs
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -30,9 +35,7 @@ jobs:
           ${{ runner.os }}-
     - name: Install dependencies
       run: |
-        cd pyscriptjs
         npm install
     - name: Run linter
       run: |
-        cd pyscriptjs
         npm run lint
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,6 +8,7 @@ repos:
     hooks:
     -   id: end-of-file-fixer
         exclude: ".*.min.js"
+    -   id: trailing-whitespace
   - repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:
diff --git a/GETTING-STARTED.md b/GETTING-STARTED.md
@@ -124,7 +124,7 @@ HTML head. You can also link to `.whl` files directly on disk like in our [toga
 </py-env>
 ```
 
-If your `.whl` is not a pure Python wheel, then open a PR or issue with [pyodide](https://github.com/pyodide/pyodide) to get it added [here](https://github.com/pyodide/pyodide/tree/main/packages). 
+If your `.whl` is not a pure Python wheel, then open a PR or issue with [pyodide](https://github.com/pyodide/pyodide) to get it added [here](https://github.com/pyodide/pyodide/tree/main/packages).
 If there's enough popular demand the pyodide team will likely work on supporting your package, regardless things will likely move faster if you make the PR and consult with the team to get unblocked.
 
 For example, NumPy and Matplotlib are available. Notice here we're using `<py-script output="plot">`
diff --git a/pyscriptjs/examples/bokeh.html b/pyscriptjs/examples/bokeh.html
@@ -12,9 +12,9 @@
         Bokeh.set_log_level("info");
     </script>
     <link rel="stylesheet" href="../build/pyscript.css" />
-    
+
     <script defer src="../build/pyscript.js"></script>
-    
+
     </head>
     <body>
         <py-env>
@@ -23,7 +23,7 @@
         </py-env>
         <h1>Bokeh Example</h1>
         <div id="myplot"></div>
-    
+
     <py-script id="main">
 import json
 import pyodide
@@ -43,6 +43,6 @@ <h1>Bokeh Example</h1>
 
 Bokeh.embed.embed_item(JSON.parse(p_json))
     </py-script>
-    
+
 </body>
 </html>
diff --git a/pyscriptjs/examples/bokeh_interactive.html b/pyscriptjs/examples/bokeh_interactive.html
@@ -12,9 +12,9 @@
         Bokeh.set_log_level("info");
     </script>
     <link rel="stylesheet" href="../build/pyscript.css" />
-    
+
     <script defer src="../build/pyscript.js"></script>
-    
+
     </head>
     <body>
         <py-env>
@@ -23,7 +23,7 @@
         </py-env>
         <h1>Bokeh Example</h1>
         <div id="myplot"></div>
-    
+
 	<py-script id="main">
 import asyncio
 import json
@@ -93,6 +93,6 @@ <h1>Bokeh Example</h1>
 
 await show(row, 'myplot')
     </py-script>
-    
+
 </body>
 </html>
diff --git a/pyscriptjs/examples/folium.html b/pyscriptjs/examples/folium.html
@@ -16,7 +16,7 @@
 import folium
 import json
 import pandas as pd
-	
+
 from pyodide.http import open_url
 
 url = (
diff --git a/pyscriptjs/examples/handtrack/say_hello.html b/pyscriptjs/examples/handtrack/say_hello.html
@@ -8,7 +8,7 @@
 
     <link rel="icon" type="image/png" href="favicon.png" />
     <link rel="stylesheet" href="../../build/pyscript.css" />
-    
+
     <script defer src="../../build/pyscript.js"></script>
   </head>
 
@@ -40,7 +40,7 @@
     handTrack.stopVideo(video.element)
     isVideo = False
     update_note.write("Video stopped")
-  
+
 async def start_video():
   global isVideo
   update_note.write("Inside sstart video")
@@ -61,9 +61,9 @@
   console.log("in RUN DETECTION: ");
   global model
   global isVideo
-  
+
   console.log("...1")
-  
+
   predictions = await model.detect(video.element)
   console.log("done...1")
   console.log("Predictions: ", predictions);
diff --git a/pyscriptjs/examples/hello_world.html b/pyscriptjs/examples/hello_world.html
@@ -8,7 +8,7 @@
 
     <link rel="icon" type="image/png" href="favicon.png" />
     <link rel="stylesheet" href="../build/pyscript.css" />
-    
+
     <script defer src="../build/pyscript.js"></script>
   </head>
 
diff --git a/pyscriptjs/examples/mario/play_mario.html b/pyscriptjs/examples/mario/play_mario.html
@@ -8,7 +8,7 @@
 
     <link rel="icon" type="image/png" href="../favicon.png" />
     <link rel="stylesheet" href="../../build/pyscript.css" />
-    
+
     <script defer src="../../build/pyscript.js"></script>
   </head>
 
@@ -69,7 +69,7 @@
     handTrack.stopVideo(video.element)
     isVideo = False
     update_note.write("Video stopped")
-  
+
 async def start_video():
   global isVideo
   update_note.write("Inside sstart video")
@@ -91,7 +91,7 @@
   global isVideo
   global last_position
   global direction
-  
+
   predictions = await model.detect(video.element)
   model.renderPredictions(predictions, canvas.element, context, video.element);
 
diff --git a/pyscriptjs/examples/panel_deckgl.html b/pyscriptjs/examples/panel_deckgl.html
@@ -41,7 +41,7 @@
     <link rel="stylesheet" href="../build/pyscript.css" />
     <script defer src="../build/pyscript.js"></script>
   </head>
-  <body>    
+  <body>
     <py-env>
       - bokeh
       - numpy
diff --git a/pyscriptjs/examples/panel_kmeans.html b/pyscriptjs/examples/panel_kmeans.html
@@ -26,7 +26,7 @@
     <script type="text/javascript">
       Bokeh.set_log_level("info");
     </script>
-        
+
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.0/dist/bundled/bootstraptemplate/bootstrap.css">
     <link rel="stylesheet" href="https://unpkg.com/@holoviz/panel@0.13.0/dist/bundled/defaulttheme/default.css">
@@ -43,7 +43,7 @@
     <link rel="stylesheet" href="../build/pyscript.css" />
     <script defer src="../build/pyscript.js"></script>
   </head>
-  
+
   <py-env>
     - altair
     - numpy
diff --git a/pyscriptjs/examples/repl2.html b/pyscriptjs/examples/repl2.html
@@ -9,7 +9,7 @@
     <link rel="icon" type="image/png" href="favicon.png" />
     <link rel="stylesheet" href="../build/pyscript.css" />
     <link rel="stylesheet" href="repl.css" />
-    
+
     <script defer src="../build/pyscript.js"></script>
   </head>
 
diff --git a/pyscriptjs/examples/simple_clock.html b/pyscriptjs/examples/simple_clock.html
@@ -8,7 +8,7 @@
 
     <link rel="icon" type="image/png" href="favicon.png" />
     <link rel="stylesheet" href="../build/pyscript.css" />
-    
+
     <script defer src="../build/pyscript.js"></script>
     <py-env>
     - paths:
@@ -34,7 +34,7 @@
     await asyncio.sleep(1)
     output = now()
     pyscript.write("outputDiv2", output)
-    
+
     out3 = Element("outputDiv3")
     if output[-1] in ["0", "4", "8"]:
       out3.write("It's espresso time!")
diff --git a/pyscriptjs/examples/todo-pylist.html b/pyscriptjs/examples/todo-pylist.html
@@ -7,7 +7,7 @@
 
     <link rel="icon" type="image/png" href="favicon.png" />
     <link rel="stylesheet" href="/build/pyscript.css" />
-    
+
     <script defer src="/build/pyscript.js"></script>
     <py-env>
     - paths:
diff --git a/pyscriptjs/examples/todo.html b/pyscriptjs/examples/todo.html
@@ -8,7 +8,7 @@
 
     <link rel="icon" type="image/png" href="favicon.png" />
     <link rel="stylesheet" href="/build/pyscript.css" />
-    
+
     <script defer src="/build/pyscript.js"></script>
     <py-env>
     - paths:
@@ -22,7 +22,7 @@
 
   <main class="max-w-xs mx-auto mt-4">
     <section>
-    
+
     <div class="text-center w-full mb-8">
       <h1 class="text-3xl font-bold text-gray-800 uppercase tracking-tight">To Do List</h1>
     </div>
@@ -32,20 +32,20 @@ <h1 class="text-3xl font-bold text-gray-800 uppercase tracking-tight">To Do List
         Add task
       </button>
     </div>
-  
+
     <py-list id="myList"></py-list>
     <div id="list-tasks-container" class="flex flex-col-reverse mt-4">
   </div>
-    
+
     <template id="task-template">
         <section class="task bg-white my-1">
             <label for="flex items-center p-2 ">
               <input class="mr-2" type="checkbox" class="task-check">
               <p class="m-0 inline"></p>
             </label>
-        </section>        
+        </section>
       </template>
-  
+
   </section>
   </main>
 </body>
diff --git a/pyscriptjs/examples/webgl/raycaster/style.css b/pyscriptjs/examples/webgl/raycaster/style.css
@@ -28,7 +28,7 @@ canvas {
 a, a:hover, a:visited {
   color: red;
   text-decoration: none;
-} 
+}
 .disable-selection {
      -moz-user-select: none; /* Firefox */
       -ms-user-select: none; /* Internet Explorer */
diff --git a/pyscriptjs/src/components/base.ts b/pyscriptjs/src/components/base.ts
@@ -145,7 +145,7 @@ export class BaseEvalElement extends HTMLElement {
                 Element = pyodide.globals.get('Element');
             }
             const out = Element(this.errorElement.id);
-            
+
             addClasses(this.errorElement, ['bg-red-200', 'p-2']);
             out.write.callKwargs(err, { append : true});
             this.errorElement.hidden = false;
diff --git a/pyscriptjs/src/components/pyrepl.ts b/pyscriptjs/src/components/pyrepl.ts
@@ -75,39 +75,39 @@ export class PyRepl extends BaseEvalElement {
           '.cm-content': { padding: 0, backgroundColor: '#f5f5f5' },
           '&.cm-focused .cm-content': { border: '1px solid #1876d2' }
         });
-        
+
         if (!this.hasAttribute('theme')) {
           this.theme = this.getAttribute('theme');
           if (this.theme == 'dark'){
             extensions.push(oneDarkTheme);
           }
           extensions.push(customTheme);
         }
-        
+
         const startState = EditorState.create({
           doc: this.code.trim(),
           extensions: extensions
         });
-  
+
         this.editor = new EditorView({
           state: startState,
           parent: this.editorNode
         });
-  
+
         const mainDiv = document.createElement('div');
         addClasses(mainDiv, ["parentBox", "flex", "flex-col", "mt-2", "mx-8", "relative"])
 
         // add Editor to main PyScript div
         mainDiv.appendChild(this.editorNode);
-        
+
         // Play Button
         this.btnRun = document.createElement('button');
         this.btnRun.innerHTML = '<svg id="" class="svelte-fa svelte-ps5qeg" style="height:20px;width:20px;vertical-align:-.125em;transform-origin:center;overflow:visible;color:green" viewBox="0 0 384 512" aria-hidden="true" role="img" xmlns="http://www.w3.org/2000/svg"><g transform="translate(192 256)" transform-origin="96 0"><g transform="translate(0,0) scale(1,1)"><path d="M361 215C375.3 223.8 384 239.3 384 256C384 272.7 375.3 288.2 361 296.1L73.03 472.1C58.21 482 39.66 482.4 24.52 473.9C9.377 465.4 0 449.4 0 432V80C0 62.64 9.377 46.63 24.52 38.13C39.66 29.64 58.21 29.99 73.03 39.04L361 215z" fill="currentColor" transform="translate(-192 -256)"></path></g></g></svg>';
         addClasses(this.btnRun, ["absolute", "right-1", "bottom-3", "opacity-0", "group-hover:opacity-100"]);
         this.editorNode.appendChild(this.btnRun);
 
         this.btnRun.onclick = wrap(this);
-  
+
         function wrap(el: any){
           function evaluatePython() {
               el.evaluate();

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ export class BaseEvalElement extends HTMLElement {`
`145`	`145`	`Element = pyodide.globals.get('Element');`
`146`	`146`	`}`
`147`	`147`	`const out = Element(this.errorElement.id);`
`148`		`-`
	`148`	`+`
`149`	`149`	`addClasses(this.errorElement, ['bg-red-200', 'p-2']);`
`150`	`150`	`out.write.callKwargs(err, { append : true});`
`151`	`151`	`this.errorElement.hidden = false;`