From 56097d6b53bb2f307e65e4fad24bd8498ec5b6aa Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Sun, 12 Feb 2023 01:24:18 +0200 Subject: [PATCH] Bump dependencies --- aiogram/dispatcher/event/telegram.py | 5 +++-- pyproject.toml | 12 ++++++------ scripts/bump_versions.py | 15 ++++++--------- tests/test_api/test_methods/test_get_url.py | 1 - tests/test_dispatcher/test_event/test_telegram.py | 1 - 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/aiogram/dispatcher/event/telegram.py b/aiogram/dispatcher/event/telegram.py index 8005c418..bb943004 100644 --- a/aiogram/dispatcher/event/telegram.py +++ b/aiogram/dispatcher/event/telegram.py @@ -3,11 +3,12 @@ from __future__ import annotations from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional from aiogram.dispatcher.middlewares.manager import MiddlewareManager -from .bases import REJECTED, UNHANDLED, MiddlewareType, SkipHandler -from .handler import CallbackType, FilterObject, HandlerObject + from ...exceptions import UnsupportedKeywordArgument from ...filters.base import Filter from ...types import TelegramObject +from .bases import REJECTED, UNHANDLED, MiddlewareType, SkipHandler +from .handler import CallbackType, FilterObject, HandlerObject if TYPE_CHECKING: from aiogram.dispatcher.router import Router diff --git a/pyproject.toml b/pyproject.toml index 52ac8f95..0c2d3a5e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ dependencies = [ "magic-filter~=1.0.9", "aiohttp~=3.8.3", "pydantic~=1.10.4", - "aiofiles~=22.1.0", + "aiofiles~=23.1.0", "certifi>=2022.9.24", ] dynamic = ["version"] @@ -62,7 +62,7 @@ proxy = [ "aiohttp-socks~=0.7.1", ] i18n = [ - "Babel~=2.9.1", + "Babel~=2.11.0", ] test = [ "pytest~=7.1.3", @@ -91,13 +91,13 @@ docs = [ "sphinxcontrib-towncrier~=0.3.1a3", ] dev = [ - "black~=22.8", + "black~=23.1", "isort~=5.11", - "ruff~=0.0.215", + "ruff~=0.0.245", "mypy~=0.981", "toml~=0.10.2", "pre-commit~=2.20.0", - "packaging~=21.3", + "packaging~=23.0", "typing-extensions~=4.3.0", ] @@ -147,7 +147,7 @@ features = [ "test", ] extra-dependencies = [ - "butcher @ git+https://github.com/aiogram/butcher.git@v0.1.10" + "butcher @ git+https://github.com/aiogram/butcher.git@v0.1.11" ] [tool.hatch.envs.test] diff --git a/scripts/bump_versions.py b/scripts/bump_versions.py index 5995dae9..7459192a 100644 --- a/scripts/bump_versions.py +++ b/scripts/bump_versions.py @@ -45,18 +45,17 @@ def replace_line(content: str, pattern: re.Pattern, new_value: str) -> str: return result -def write_package_meta(package_version: str, api_version: str) -> None: +def write_package_meta(api_version: str) -> None: path = Path.cwd() / "aiogram" / "__init__.py" content = path.read_text() - content = replace_line(content, PACKAGE_VERSION, package_version) content = replace_line(content, API_VERSION, api_version) print(f"Write {path}") path.write_text(content) -def write_readme(package_version: str, api_version: str) -> None: +def write_readme(api_version: str) -> None: path = Path.cwd() / "README.rst" content = path.read_text() content = replace_line(content, API_VERSION_BADGE, api_version) @@ -65,7 +64,7 @@ def write_readme(package_version: str, api_version: str) -> None: path.write_text(content) -def write_docs_index(package_version: str, api_version: str) -> None: +def write_docs_index(api_version: str) -> None: path = Path.cwd() / "docs" / "index.rst" content = path.read_text() content = replace_line(content, API_VERSION_BADGE, api_version) @@ -74,14 +73,12 @@ def write_docs_index(package_version: str, api_version: str) -> None: def main(): - package_version = get_package_version() api_version = get_telegram_api_version() - print(f"Package version: {package_version}") print(f"Telegram Bot API version: {api_version}") - write_package_meta(package_version=package_version, api_version=api_version) - write_readme(package_version=package_version, api_version=api_version) - write_docs_index(package_version=package_version, api_version=api_version) + write_package_meta(api_version=api_version) + write_readme(api_version=api_version) + write_docs_index(api_version=api_version) if __name__ == "__main__": diff --git a/tests/test_api/test_methods/test_get_url.py b/tests/test_api/test_methods/test_get_url.py index 76b24200..9eec1017 100644 --- a/tests/test_api/test_methods/test_get_url.py +++ b/tests/test_api/test_methods/test_get_url.py @@ -35,7 +35,6 @@ class TestGetMessageUrl: force_private: bool, expected_result: Optional[str], ): - fake_chat = Chat(id=chat_id, username=chat_username, type=chat_type) fake_message_id = 10 fake_message = Message( diff --git a/tests/test_dispatcher/test_event/test_telegram.py b/tests/test_dispatcher/test_event/test_telegram.py index 1f892de0..973fa17c 100644 --- a/tests/test_dispatcher/test_event/test_telegram.py +++ b/tests/test_dispatcher/test_event/test_telegram.py @@ -13,7 +13,6 @@ from aiogram.exceptions import UnsupportedKeywordArgument from aiogram.filters import Filter from aiogram.types import Chat, Message, User - # TODO: Test middlewares in routers tree