From a0686228d529b7421aab76a3383d49938b865ada Mon Sep 17 00:00:00 2001 From: Ying Xiang Date: Sat, 21 Oct 2023 02:06:23 +0800 Subject: [PATCH] update --- .pre-commit-config.yaml | 46 +++++++++---------- src/fuzzy_json/decoder.py | 4 +- .../test_data/{invaild => invalid}/case.jsonx | 0 .../test_data/{vaild => valid}/case0.json | 0 .../test_data/{vaild => valid}/case1.json | 0 .../test_data/{vaild => valid}/case10.json | 0 .../test_data/{vaild => valid}/case11.json | 0 .../test_data/{vaild => valid}/case12.json | 0 .../test_data/{vaild => valid}/case13.json | 0 .../test_data/{vaild => valid}/case2.json | 0 .../test_data/{vaild => valid}/case3.json | 0 .../test_data/{vaild => valid}/case4.json | 0 .../test_data/{vaild => valid}/case5.json | 0 .../test_data/{vaild => valid}/case6.json | 0 .../test_data/{vaild => valid}/case7.json | 0 .../test_data/{vaild => valid}/case8.json | 0 .../test_data/{vaild => valid}/case9.json | 0 src/fuzzy_json/tests/test_decoder.py | 6 +-- 18 files changed, 28 insertions(+), 28 deletions(-) rename src/fuzzy_json/tests/test_data/{invaild => invalid}/case.jsonx (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case0.json (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case1.json (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case10.json (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case11.json (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case12.json (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case13.json (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case2.json (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case3.json (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case4.json (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case5.json (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case6.json (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case7.json (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case8.json (100%) rename src/fuzzy_json/tests/test_data/{vaild => valid}/case9.json (100%) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 854a398..0ab4647 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,12 +1,13 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: v4.5.0 hooks: # - id: check-added-large-files - - id: check-case-conflict - id: check-json - - id: check-merge-conflict + - id: check-toml - id: check-yaml + - id: check-case-conflict + - id: check-merge-conflict - id: end-of-file-fixer - id: fix-encoding-pragma args: [--remove] @@ -14,33 +15,32 @@ repos: - id: trailing-whitespace args: [--markdown-linebreak-ext=md] exclude: "__snapshots__/" - # this is not technically always safe but usually is - # use comments `# isort: off` and `# isort: on` to disable/re-enable isort + + - repo: https://github.com/psf/black + rev: 23.10.0 + hooks: + - id: black + args: + - "--line-length=240" + + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.1.1 + hooks: + - id: ruff + args: + - "--line-length=240" + - repo: https://github.com/pycqa/isort rev: 5.12.0 hooks: - id: isort args: [--line-length=240, --profile=black] - # this is slightly dangerous because python imports have side effects - # and this tool removes unused imports, which may be providing - # necessary side effects for the code to run - - repo: https://github.com/PyCQA/autoflake - rev: v1.6.1 + - repo: https://github.com/codespell-project/codespell + rev: v2.2.5 hooks: - - id: autoflake - args: - - "--in-place" - - "--expand-star-imports" - - "--remove-duplicate-keys" - - "--remove-unused-variables" - - "--remove-all-unused-imports" - - - repo: https://github.com/psf/black - rev: 22.8.0 - hooks: - - id: black - args: [--line-length=240, --exclude=""] + - id: codespell + types_or: [python, markdown] - repo: local hooks: diff --git a/src/fuzzy_json/decoder.py b/src/fuzzy_json/decoder.py index ecbaad5..c1679c4 100644 --- a/src/fuzzy_json/decoder.py +++ b/src/fuzzy_json/decoder.py @@ -186,7 +186,7 @@ def state_int(input: str, stack: list[str]) -> str | None: if input[0].isspace(): return input[0] + state_post_value(input[1:], stack) # NOTE: - # the original grammer not accept 3e3 (without dot) + # the original grammar not accept 3e3 (without dot) if input[0] in {"e", "E"}: return input[0] + state_exponent_sign(input[1:], stack) @@ -228,7 +228,7 @@ def state_double(input: str, stack: list[str]) -> str | None: @state def state_exponent_sign(input: str, stack: list[str]) -> str | None: # NOTE: - # the original grammer not accept 3.0e3 (without sign) + # the original grammar not accept 3.0e3 (without sign) if input[0].isdigit(): return input[0] + state_exponent_digits(input[1:], stack) diff --git a/src/fuzzy_json/tests/test_data/invaild/case.jsonx b/src/fuzzy_json/tests/test_data/invalid/case.jsonx similarity index 100% rename from src/fuzzy_json/tests/test_data/invaild/case.jsonx rename to src/fuzzy_json/tests/test_data/invalid/case.jsonx diff --git a/src/fuzzy_json/tests/test_data/vaild/case0.json b/src/fuzzy_json/tests/test_data/valid/case0.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case0.json rename to src/fuzzy_json/tests/test_data/valid/case0.json diff --git a/src/fuzzy_json/tests/test_data/vaild/case1.json b/src/fuzzy_json/tests/test_data/valid/case1.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case1.json rename to src/fuzzy_json/tests/test_data/valid/case1.json diff --git a/src/fuzzy_json/tests/test_data/vaild/case10.json b/src/fuzzy_json/tests/test_data/valid/case10.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case10.json rename to src/fuzzy_json/tests/test_data/valid/case10.json diff --git a/src/fuzzy_json/tests/test_data/vaild/case11.json b/src/fuzzy_json/tests/test_data/valid/case11.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case11.json rename to src/fuzzy_json/tests/test_data/valid/case11.json diff --git a/src/fuzzy_json/tests/test_data/vaild/case12.json b/src/fuzzy_json/tests/test_data/valid/case12.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case12.json rename to src/fuzzy_json/tests/test_data/valid/case12.json diff --git a/src/fuzzy_json/tests/test_data/vaild/case13.json b/src/fuzzy_json/tests/test_data/valid/case13.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case13.json rename to src/fuzzy_json/tests/test_data/valid/case13.json diff --git a/src/fuzzy_json/tests/test_data/vaild/case2.json b/src/fuzzy_json/tests/test_data/valid/case2.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case2.json rename to src/fuzzy_json/tests/test_data/valid/case2.json diff --git a/src/fuzzy_json/tests/test_data/vaild/case3.json b/src/fuzzy_json/tests/test_data/valid/case3.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case3.json rename to src/fuzzy_json/tests/test_data/valid/case3.json diff --git a/src/fuzzy_json/tests/test_data/vaild/case4.json b/src/fuzzy_json/tests/test_data/valid/case4.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case4.json rename to src/fuzzy_json/tests/test_data/valid/case4.json diff --git a/src/fuzzy_json/tests/test_data/vaild/case5.json b/src/fuzzy_json/tests/test_data/valid/case5.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case5.json rename to src/fuzzy_json/tests/test_data/valid/case5.json diff --git a/src/fuzzy_json/tests/test_data/vaild/case6.json b/src/fuzzy_json/tests/test_data/valid/case6.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case6.json rename to src/fuzzy_json/tests/test_data/valid/case6.json diff --git a/src/fuzzy_json/tests/test_data/vaild/case7.json b/src/fuzzy_json/tests/test_data/valid/case7.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case7.json rename to src/fuzzy_json/tests/test_data/valid/case7.json diff --git a/src/fuzzy_json/tests/test_data/vaild/case8.json b/src/fuzzy_json/tests/test_data/valid/case8.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case8.json rename to src/fuzzy_json/tests/test_data/valid/case8.json diff --git a/src/fuzzy_json/tests/test_data/vaild/case9.json b/src/fuzzy_json/tests/test_data/valid/case9.json similarity index 100% rename from src/fuzzy_json/tests/test_data/vaild/case9.json rename to src/fuzzy_json/tests/test_data/valid/case9.json diff --git a/src/fuzzy_json/tests/test_decoder.py b/src/fuzzy_json/tests/test_decoder.py index 45e0375..3c28409 100644 --- a/src/fuzzy_json/tests/test_decoder.py +++ b/src/fuzzy_json/tests/test_decoder.py @@ -25,7 +25,7 @@ def test_repaired_json_simple_case(snapshot: SnapshotAssertion) -> None: @pytest.mark.parametrize( "test_filename", - (Path(__file__).parent / "test_data").glob("vaild/*.json"), + (Path(__file__).parent / "test_data").glob("valid/*.json"), ids=lambda x: x.name, ) def test_repaired_json_vaild_case(snapshot: SnapshotAssertion, test_filename: Path) -> None: @@ -39,7 +39,7 @@ def test_repaired_json_vaild_case(snapshot: SnapshotAssertion, test_filename: Pa @pytest.mark.parametrize( "test_filename", - (Path(__file__).parent / "test_data").glob("invaild/*.jsonx"), + (Path(__file__).parent / "test_data").glob("invalid/*.jsonx"), ids=lambda x: x.name, ) def test_repaired_json_invaild_case(snapshot: SnapshotAssertion, test_filename: Path) -> None: @@ -49,6 +49,6 @@ def test_repaired_json_invaild_case(snapshot: SnapshotAssertion, test_filename: def test_repair_json_fail() -> None: - with pytest.raises(json.decoder.JSONDecodeError) as e: + with pytest.raises(json.decoder.JSONDecodeError) as _: # test that it will raise JSONDecodeError if it can't fix the JSON loads("{", auto_repair=True)