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.
This commit is contained in:
Antonio Cuni
2023-10-05 13:10:31 +00:00
committed by GitHub
parent d5b6935c0b
commit 4256a81653
16 changed files with 36 additions and 57 deletions

View File

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

View File

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

View File

@@ -7,31 +7,7 @@ dynamic = ["version"]
[tool.codespell] [tool.codespell]
ignore-words-list = "afterall" ignore-words-list = "afterall"
skip = "*.js,*.json"
[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
[tool.setuptools] [tool.setuptools]
include-package-data = false include-package-data = false

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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