diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 625e640f5..b44923b45 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,14 +17,14 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.3.5" + rev: "v0.5.0" hooks: - id: ruff args: [--fix] - id: ruff-format - repo: https://github.com/pre-commit/mirrors-clang-format - rev: "v18.1.3" + rev: "v18.1.8" hooks: - id: clang-format types_or: [c++, c, cuda] @@ -45,9 +45,15 @@ repos: exclude: ^src/templates/python$ - repo: https://github.com/codespell-project/codespell - rev: "v2.2.6" + rev: "v2.3.0" hooks: - id: codespell + args: + [ + "--ignore-words-list", + "ags,aray,asend,ba,crate,falsy,feld,inflight,lits,nd,slowy,te,oint,conveniant,atmost", + ] + exclude: ^(benchmark/benchmarks/pystone_benchmarks/pystone\.py|src/js/package-lock\.json)$ - repo: https://github.com/pre-commit/mirrors-mypy rev: "v1.11.0" diff --git a/packages/_tests/test_packages_common.py b/packages/_tests/test_packages_common.py index eba0ce5ac..033e270b3 100644 --- a/packages/_tests/test_packages_common.py +++ b/packages/_tests/test_packages_common.py @@ -97,7 +97,7 @@ def test_import( def _import_pkg(): for import_name in import_names: - selenium_standalone.run_async("import %s" % import_name) + selenium_standalone.run_async(f"import {import_name}") benchmark(_import_pkg) diff --git a/packages/lzma/test_lzma.py b/packages/lzma/test_lzma.py index 937af9287..0a5f504ef 100644 --- a/packages/lzma/test_lzma.py +++ b/packages/lzma/test_lzma.py @@ -5,9 +5,10 @@ from pytest_pyodide import run_in_pyodide def test_lzma(selenium): # TODO: libregrtest.main(["test_lzma"]) doesn't collect any tests for some unknown reason. - import test.test_lzma import unittest + import test.test_lzma + suite = unittest.TestSuite( [unittest.TestLoader().loadTestsFromModule(test.test_lzma)] ) diff --git a/packages/sqlite3/test_sqlite3.py b/packages/sqlite3/test_sqlite3.py index 8bc265d75..1e0844716 100644 --- a/packages/sqlite3/test_sqlite3.py +++ b/packages/sqlite3/test_sqlite3.py @@ -3,9 +3,10 @@ from pytest_pyodide import run_in_pyodide @run_in_pyodide(packages=["test", "sqlite3"], pytest_assert_rewrites=False) def test_sqlite3(selenium): - import test.test_sqlite3 import unittest + import test.test_sqlite3 + suite = unittest.TestSuite( [unittest.TestLoader().loadTestsFromModule(test.test_sqlite3)] ) diff --git a/packages/ssl/test_ssl.py b/packages/ssl/test_ssl.py index 00a222cfa..ed8642167 100644 --- a/packages/ssl/test_ssl.py +++ b/packages/ssl/test_ssl.py @@ -6,6 +6,7 @@ def test_ssl(selenium): import platform import unittest import unittest.mock + from test.libregrtest.main import main platform.platform(aliased=True) diff --git a/pyproject.toml b/pyproject.toml index ed94ac059..798b12588 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,7 @@ lint.select = [ "PLE", # pylint errors "UP", # pyupgrade ] -lint.ignore = ["E402", "E501", "E731", "E741", "UP038"] +lint.ignore = ["E402", "E501", "E731", "E741", "UP031", "UP038"] # line-length = 219 # E501: Recommended goal is 88 to match black target-version = "py311" diff --git a/src/core/jslib.h b/src/core/jslib.h index c3361373e..bceb722a0 100644 --- a/src/core/jslib.h +++ b/src/core/jslib.h @@ -18,10 +18,7 @@ typedef struct Js_Identifier JsRef object; } Js_Identifier; -#define Js_static_string_init(value) \ - { \ - .string = value, .object = NULL \ - } +#define Js_static_string_init(value) { .string = value, .object = NULL } #define Js_static_string(varname, value) \ static Js_Identifier varname = Js_static_string_init(value) #define Js_IDENTIFIER(varname) Js_static_string(JsId_##varname, #varname)