run pre-commit on all files (#1789)

pre-commit.ci has been disabled for a while.
This PR ensures that all the files has been validated/formatted by pre-commit, to avoid spurious diffs in subsequent PRs.

During the process, ruff broke the code because it removed an "unused" import which was actually used.
A linter which breaks my code is a linter which I cannot trust, so I just removed it. I re-enabled isort instead.

.github/workflows/publish-release.yml

@@ -41,7 +41,7 @@ jobs:
 
             - name: build
               run: npm run build
-            
+
             - name: Generate index.html in snapshot
               working-directory: .
               run: sed 's#_PATH_#https://pyscript.net/releases/${{ github.ref_name }}/#' ./public/index.html > ./pyscript.core/dist/index.html

.github/workflows/publish-snapshot.yml

@@ -39,13 +39,13 @@ jobs:
                       ${{ runner.os }}-build-${{ env.cache-name }}-
                       ${{ runner.os }}-build-
                       ${{ runner.os }}-
-            
+
             - name: Install Dependencies
               run: npm install
-            
+
             - name: Build Pyscript.core
               run: npm run build
-            
+
             - name: Configure AWS credentials
               uses: aws-actions/configure-aws-credentials@v4
               with:
@@ -58,4 +58,4 @@ jobs:
 
             - name: Copy to Snapshot
               run: >
-                  aws s3 sync ./dist/ s3://pyscript.net/snapshots/${{ inputs.snapshot_version }}/
+                  aws s3 sync ./dist/ s3://pyscript.net/snapshots/${{ inputs.snapshot_version }}/

.github/workflows/publish-unstable.yml

@@ -46,7 +46,7 @@ jobs:
 
             - name: Build
               run: npm run build
-            
+
             - name: Generate index.html in snapshot
               working-directory: .
               run: sed 's#_PATH_#https://pyscript.net/unstable/#' ./public/index.html > ./pyscript.core/dist/index.html

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
             - name: Checkout
               uses: actions/checkout@v4
               with:
-                fetch-depth: 3
+                  fetch-depth: 3
 
             # display a git log: when you run CI on PRs, github automatically
             # merges the PR into main and run the CI on that commit. The idea

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 # This is the configuration for pre-commit, a local framework for managing pre-commit hooks
 #   Check out the docs at: https://pre-commit.com/
 ci:
-    skip: [eslint]
+    #skip: [eslint]
     autoupdate_schedule: monthly
 
 default_stages: [commit]
@@ -24,13 +24,6 @@ repos:
             exclude: pyscript\.core/dist|\.min\.js$
           - id: trailing-whitespace
 
-    - repo: https://github.com/charliermarsh/ruff-pre-commit
-      rev: v0.0.257
-      hooks:
-          - id: ruff
-            exclude: pyscript\.core/src/stdlib/pyscript/__init__\.py|pyscript\.core/test|pyscript\.core/dist|pyscript\.core/src/stdlib/pyscript\.py
-            args: [--fix]
-
     - repo: https://github.com/psf/black
       rev: 23.1.0
       hooks:
@@ -51,3 +44,10 @@ repos:
           - id: prettier
             exclude: pyscript\.core/test|pyscript\.core/dist|pyscript\.core/types|pyscript.core/src/stdlib/pyscript.js|pyscript\.sw/
             args: [--tab-width, "4"]
+
+    - repo: https://github.com/pycqa/isort
+      rev: 5.12.0
+      hooks:
+          - id: isort
+            name: isort (python)
+            args: [--profile, black]

public/index.html

@@ -47,7 +47,8 @@ now = datetime.now()
 display(now.strftime("%m/%d/%Y, %H:%M:%S"))
     </py-script>
     </body>
-&lt;/html&gt;</pre>
+&lt;/html&gt;</pre
+            >
         </main>
     </body>
-</html>
+</html>

pyproject.toml

@@ -7,31 +7,7 @@ dynamic = ["version"]
 
 [tool.codespell]
 ignore-words-list = "afterall"
-
-[tool.ruff]
-builtins = [
-    "Element",
-    "pyscript",
-]
-ignore = [
-    "S101",
-    "S113",
-]
-line-length = 100
-select = [
-    "B",
-    "C9",
-    "E",
-    "F",
-    "I",
-    "S",
-    "UP",
-    "W",
-]
-target-version = "py310"
-
-[tool.ruff.mccabe]
-max-complexity = 10
+skip = "*.js,*.json"
 
 [tool.setuptools]
 include-package-data = false

pyscript.core/src/stdlib/pyscript/__init__.py

@@ -29,15 +29,15 @@
 #     pyscript.magic_js. This is the blessed way to access them from pyscript,
 #     as it works transparently in both the main thread and worker cases.
 
+from pyscript.display import HTML, display
 from pyscript.magic_js import (
     RUNNING_IN_WORKER,
     PyWorker,
-    window,
+    current_target,
     document,
     sync,
-    current_target,
+    window,
 )
-from pyscript.display import HTML, display
 
 try:
     from pyscript.event_handling import when

pyscript.core/src/stdlib/pyscript/magic_js.py

@@ -1,5 +1,5 @@
-from pyscript.util import NotSupported
 import js as globalThis
+from pyscript.util import NotSupported
 
 RUNNING_IN_WORKER = not hasattr(globalThis, "document")
 

pyscript.core/test/pydom.py

@@ -1,8 +1,9 @@
 import random
+from datetime import datetime as dt
+
 from pyscript import display
 from pyweb import pydom
 from pyweb.base import when
-from datetime import datetime as dt
 
 
 @when("click", "#just-a-button")

pyscript.core/test/pyscript_dom/tests/test_dom.py

@@ -1,7 +1,7 @@
-import pytest
-from pyscript import document, when
 from unittest import mock
 
+import pytest
+from pyscript import document, when
 from pyweb import pydom
 
 

pyscript.core/test/terminal.py

@@ -1,8 +1,9 @@
 ###### magic monkey patching ######
-import sys
 import builtins
-from pyscript import sync
+import sys
+
 from pyodide.code import eval_code
+from pyscript import sync
 
 sys.stdout = sync
 builtins.input = sync.readline

pyscript.core/test/worker.py

@@ -1,6 +1,5 @@
-from pyscript import display, sync
-
 import a
+from pyscript import display, sync
 
 display("Hello World", target="test", append=True)
 

pyscript.core/tests/integration/test_01_basic.py

@@ -2,7 +2,7 @@ import re
 
 import pytest
 
-from .support import PyScriptTest, skip_worker, only_main
+from .support import PyScriptTest, only_main, skip_worker
 
 
 class TestBasic(PyScriptTest):

pyscript.core/tests/integration/test_02_display.py

@@ -1,10 +1,10 @@
 ################################################################################
 
 import base64
+import html
 import io
 import os
 import re
-import html
 
 import numpy as np
 import pytest
@@ -15,9 +15,9 @@ from .support import (
     PyScriptTest,
     filter_inner_text,
     filter_page_content,
-    wait_for_render,
-    skip_worker,
     only_main,
+    skip_worker,
+    wait_for_render,
 )
 
 DISPLAY_OUTPUT_ID_PATTERN = r'script-py[id^="py-"]'

pyscript.core/tests/integration/test_async.py

@@ -1,4 +1,5 @@
 import pytest
+
 from .support import PyScriptTest, filter_inner_text, only_main