diff --git a/.github/workflows/scripts/lint.py b/.github/workflows/scripts/lint.py index ae65965..db5879c 100644 --- a/.github/workflows/scripts/lint.py +++ b/.github/workflows/scripts/lint.py @@ -2,9 +2,12 @@ from __future__ import annotations from pathlib import Path -ROOT_DIR = Path(__file__).resolve().parent.parent.parent / "minearchy_bot" +ROOT_DIR = Path(__file__).resolve().parent.parent.parent.parent / "minearchy_bot" for fp in ROOT_DIR.rglob("__init__.py"): + if fp.parent.name == "minearchy_bot": + continue + if not (content := fp.read_text()): continue diff --git a/lint.sh b/lint.sh index 966a711..9ea493b 100755 --- a/lint.sh +++ b/lint.sh @@ -7,7 +7,7 @@ unimport ./ --ignore-init --gitignore -r isort ./ # run our lint script -python ./.github/workflows/lint.py +python ./.github/workflows/scripts/lint.py # run flynt flynt ./ -tc diff --git a/minearchy_bot/cogs/error_handler.py b/minearchy_bot/cogs/error_handler.py index 652e3db..65f7eb2 100644 --- a/minearchy_bot/cogs/error_handler.py +++ b/minearchy_bot/cogs/error_handler.py @@ -1,9 +1,9 @@ from __future__ import annotations +from asyncio import gather as await_parallel from contextlib import suppress as suppress_error from traceback import format_exception as format_exit from typing import TYPE_CHECKING -from asyncio import gather as await_parallel from discord import HTTPException from discord.ext.commands import (