diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 8fbd4852..27356258 100644 --- a/.github/workflows/publish-release.yml +++ b/.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 diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index e5502831..17699458 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.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 }}/ \ No newline at end of file + aws s3 sync ./dist/ s3://pyscript.net/snapshots/${{ inputs.snapshot_version }}/ diff --git a/.github/workflows/publish-unstable.yml b/.github/workflows/publish-unstable.yml index cb11a8d7..26436e91 100644 --- a/.github/workflows/publish-unstable.yml +++ b/.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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cbe1ff49..cb62b883 100644 --- a/.github/workflows/test.yml +++ b/.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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6ed5f8e5..f34c0d0b 100644 --- a/.pre-commit-config.yaml +++ b/.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] diff --git a/public/index.html b/public/index.html index 857cabfd..90f67f08 100644 --- a/public/index.html +++ b/public/index.html @@ -47,7 +47,8 @@ now = datetime.now() display(now.strftime("%m/%d/%Y, %H:%M:%S")) </py-script> </body> -</html> +</html> - \ No newline at end of file + diff --git a/pyproject.toml b/pyproject.toml index 4d1d6b94..f56bd121 100644 --- a/pyproject.toml +++ b/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 diff --git a/pyscript.core/src/stdlib/pyscript/__init__.py b/pyscript.core/src/stdlib/pyscript/__init__.py index 26cddb34..056961fa 100644 --- a/pyscript.core/src/stdlib/pyscript/__init__.py +++ b/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 diff --git a/pyscript.core/src/stdlib/pyscript/magic_js.py b/pyscript.core/src/stdlib/pyscript/magic_js.py index 6eb629cb..22c79f65 100644 --- a/pyscript.core/src/stdlib/pyscript/magic_js.py +++ b/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") diff --git a/pyscript.core/test/pydom.py b/pyscript.core/test/pydom.py index a5ec8b13..e251b8b4 100644 --- a/pyscript.core/test/pydom.py +++ b/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") diff --git a/pyscript.core/test/pyscript_dom/tests/test_dom.py b/pyscript.core/test/pyscript_dom/tests/test_dom.py index fa2531b8..29663224 100644 --- a/pyscript.core/test/pyscript_dom/tests/test_dom.py +++ b/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 diff --git a/pyscript.core/test/terminal.py b/pyscript.core/test/terminal.py index 7ec20067..089614d7 100644 --- a/pyscript.core/test/terminal.py +++ b/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 diff --git a/pyscript.core/test/worker.py b/pyscript.core/test/worker.py index 43b2019f..680464fc 100644 --- a/pyscript.core/test/worker.py +++ b/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) diff --git a/pyscript.core/tests/integration/test_01_basic.py b/pyscript.core/tests/integration/test_01_basic.py index 0a37fcb8..e2745b60 100644 --- a/pyscript.core/tests/integration/test_01_basic.py +++ b/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): diff --git a/pyscript.core/tests/integration/test_02_display.py b/pyscript.core/tests/integration/test_02_display.py index 0b304490..1ea60330 100644 --- a/pyscript.core/tests/integration/test_02_display.py +++ b/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-"]' diff --git a/pyscript.core/tests/integration/test_async.py b/pyscript.core/tests/integration/test_async.py index a9779eb5..8c265a59 100644 --- a/pyscript.core/tests/integration/test_async.py +++ b/pyscript.core/tests/integration/test_async.py @@ -1,4 +1,5 @@ import pytest + from .support import PyScriptTest, filter_inner_text, only_main