From fe26d9aa08e5b7865a83faa5418a492b7c377fd7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 23:12:56 +0000 Subject: [PATCH 1/3] :arrow_up: auto update by pre-commit hooks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.7.3 → v0.8.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.7.3...v0.8.1) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f210292..9829b94 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ ci: autoupdate_commit_msg: ':arrow_up: auto update by pre-commit hooks' repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.7.3 + rev: v0.8.1 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] From 7e8e7d7966b1242fc2f72245c0af8a7bbc78bdf5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 23:13:02 +0000 Subject: [PATCH 2/3] :rotating_light: auto fix by pre-commit hooks --- nonebot_plugin_tetris_stats/games/__init__.py | 2 +- .../games/tetrio/api/schemas/summaries/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nonebot_plugin_tetris_stats/games/__init__.py b/nonebot_plugin_tetris_stats/games/__init__.py index f64cfad..7f5ed9b 100644 --- a/nonebot_plugin_tetris_stats/games/__init__.py +++ b/nonebot_plugin_tetris_stats/games/__init__.py @@ -44,7 +44,7 @@ async def _(matcher: Matcher, account: MessageFormatError): @alc.handle() async def _(matcher: Matcher, matches: AlcMatches): - if matches.head_matched and matches.options != {} or matches.main_args == {}: + if (matches.head_matched and matches.options != {}) or matches.main_args == {}: await matcher.finish( (f'{matches.error_info!r}\n' if matches.error_info is not None else '') + f'输入"{matches.header_result} --help"查看帮助' diff --git a/nonebot_plugin_tetris_stats/games/tetrio/api/schemas/summaries/__init__.py b/nonebot_plugin_tetris_stats/games/tetrio/api/schemas/summaries/__init__.py index 8a8f100..0f608df 100644 --- a/nonebot_plugin_tetris_stats/games/tetrio/api/schemas/summaries/__init__.py +++ b/nonebot_plugin_tetris_stats/games/tetrio/api/schemas/summaries/__init__.py @@ -14,8 +14,8 @@ 'SoloSuccessModel', 'SummariesModel', 'Zen', + 'ZenSuccessModel', 'Zenith', 'ZenithEx', 'ZenithSuccessModel', - 'ZenSuccessModel', ] From 95aa5639215b2c2d8b17a85b2530ce9cf6f24bbb Mon Sep 17 00:00:00 2001 From: shoucandanghehe Date: Tue, 3 Dec 2024 20:20:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=9A=A8=20fix=20ruff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nonebot_plugin_tetris_stats/games/tetrio/__init__.py | 2 +- nonebot_plugin_tetris_stats/games/tetrio/constant.py | 2 +- nonebot_plugin_tetris_stats/games/tetrio/rank/__init__.py | 2 +- nonebot_plugin_tetris_stats/games/top/constant.py | 2 +- nonebot_plugin_tetris_stats/games/tos/constant.py | 2 +- nonebot_plugin_tetris_stats/utils/host.py | 4 ++-- nonebot_plugin_tetris_stats/utils/screenshot.py | 2 +- nonebot_plugin_tetris_stats/utils/templates.py | 6 +++--- pyproject.toml | 2 -- 9 files changed, 11 insertions(+), 13 deletions(-) diff --git a/nonebot_plugin_tetris_stats/games/tetrio/__init__.py b/nonebot_plugin_tetris_stats/games/tetrio/__init__.py index 079b81e..16e23fa 100644 --- a/nonebot_plugin_tetris_stats/games/tetrio/__init__.py +++ b/nonebot_plugin_tetris_stats/games/tetrio/__init__.py @@ -23,7 +23,7 @@ def get_player(user_id_or_name: str) -> Player | MessageFormatError: ) -from . import bind, config, list, query, rank, record # noqa: E402 +from . import bind, config, list, query, rank, record # noqa: A004, E402 main_command.add(command) diff --git a/nonebot_plugin_tetris_stats/games/tetrio/constant.py b/nonebot_plugin_tetris_stats/games/tetrio/constant.py index beb48c7..e7b0297 100644 --- a/nonebot_plugin_tetris_stats/games/tetrio/constant.py +++ b/nonebot_plugin_tetris_stats/games/tetrio/constant.py @@ -1,4 +1,4 @@ -from re import compile +from re import compile # noqa: A004 from typing import Literal from yarl import URL diff --git a/nonebot_plugin_tetris_stats/games/tetrio/rank/__init__.py b/nonebot_plugin_tetris_stats/games/tetrio/rank/__init__.py index 57fa95e..5cd5fb9 100644 --- a/nonebot_plugin_tetris_stats/games/tetrio/rank/__init__.py +++ b/nonebot_plugin_tetris_stats/games/tetrio/rank/__init__.py @@ -146,7 +146,7 @@ async def _() -> None: await get_tetra_league_data() -from . import all, detail # noqa: E402 +from . import all, detail # noqa: A004, E402 base_command.add(command) diff --git a/nonebot_plugin_tetris_stats/games/top/constant.py b/nonebot_plugin_tetris_stats/games/top/constant.py index baa1a00..cec463d 100644 --- a/nonebot_plugin_tetris_stats/games/top/constant.py +++ b/nonebot_plugin_tetris_stats/games/top/constant.py @@ -1,4 +1,4 @@ -from re import compile +from re import compile # noqa: A004 from typing import Literal from yarl import URL diff --git a/nonebot_plugin_tetris_stats/games/tos/constant.py b/nonebot_plugin_tetris_stats/games/tos/constant.py index 47830a6..3ecdaba 100644 --- a/nonebot_plugin_tetris_stats/games/tos/constant.py +++ b/nonebot_plugin_tetris_stats/games/tos/constant.py @@ -1,4 +1,4 @@ -from re import compile +from re import compile # noqa: A004 from typing import Literal from yarl import URL diff --git a/nonebot_plugin_tetris_stats/utils/host.py b/nonebot_plugin_tetris_stats/utils/host.py index 1af1097..572edbc 100644 --- a/nonebot_plugin_tetris_stats/utils/host.py +++ b/nonebot_plugin_tetris_stats/utils/host.py @@ -4,7 +4,7 @@ from pathlib import Path as FilePath from typing import TYPE_CHECKING, ClassVar, Literal -from aiofiles import open +from aiofiles import open as aopen from fastapi import BackgroundTasks, FastAPI, Path, status from fastapi.responses import FileResponse, HTMLResponse, Response from fastapi.staticfiles import StaticFiles @@ -87,7 +87,7 @@ async def _( async def write_cache(path: FilePath, data: bytes) -> None: path.parent.mkdir(parents=True, exist_ok=True) - async with open(path, 'wb') as file: + async with aopen(path, 'wb') as file: await file.write(data) diff --git a/nonebot_plugin_tetris_stats/utils/screenshot.py b/nonebot_plugin_tetris_stats/utils/screenshot.py index ee7a672..52029d5 100644 --- a/nonebot_plugin_tetris_stats/utils/screenshot.py +++ b/nonebot_plugin_tetris_stats/utils/screenshot.py @@ -1,4 +1,4 @@ -from playwright.async_api import BrowserContext, TimeoutError, ViewportSize +from playwright.async_api import BrowserContext, TimeoutError, ViewportSize # noqa: A004 from ..config.config import config from .browser import BrowserManager diff --git a/nonebot_plugin_tetris_stats/utils/templates.py b/nonebot_plugin_tetris_stats/utils/templates.py index ce1ab06..d169405 100644 --- a/nonebot_plugin_tetris_stats/utils/templates.py +++ b/nonebot_plugin_tetris_stats/utils/templates.py @@ -5,7 +5,7 @@ from time import time_ns from zipfile import ZipFile -from aiofiles import open +from aiofiles import open as aopen from httpx import AsyncClient from nonebot import get_driver from nonebot.log import logger @@ -46,7 +46,7 @@ async def download_templates(tag: str) -> Path: f'https://github.com/A-Minos/tetris-stats-templates/releases/download/{tag}/dist.zip', follow_redirects=True, ) as response, - open(path, 'wb') as file, + aopen(path, 'wb') as file, ): response.raise_for_status() progress.update(task_id, total=int(response.headers.get('content-length', 0)) or None) @@ -76,7 +76,7 @@ async def check_hash(hash_file_path: Path) -> bool: if not file_path.is_file(): logger.error(f'{file_path.name} 不存在或不是文件') return False - async with open(file_path, 'rb') as file: + async with aopen(file_path, 'rb') as file: while True: chunk = await file.read(65535) if not chunk: diff --git a/pyproject.toml b/pyproject.toml index d4b4a86..e363241 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -132,8 +132,6 @@ select = [ ] ignore = [ "E501", # 过长的行由 ruff format 处理, 剩余的都是字符串 - "ANN101", # 由 type checker 自动推断 - "ANN102", # 由 type checker 自动推断 "ANN202", # 向 NoneBot 注册的函数 "TRY003", "COM812", # 强制尾随逗号