From 7665e6b0e588fad31a2614d29e3ac2d671dc9fa8 Mon Sep 17 00:00:00 2001 From: Harshil <37377066+harshil21@users.noreply.github.com> Date: Mon, 25 Oct 2021 22:35:43 +0530 Subject: [PATCH 1/3] fix pylint pre-commit --- telegram/ext/_builders.py | 1 - telegram/ext/_dispatcher.py | 4 ++-- telegram/ext/_updater.py | 2 +- telegram/ext/filters.py | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/telegram/ext/_builders.py b/telegram/ext/_builders.py index fae6cd48a63..92b80535e65 100644 --- a/telegram/ext/_builders.py +++ b/telegram/ext/_builders.py @@ -133,7 +133,6 @@ # the UpdaterBuilder has all method that the DispatcherBuilder has class _BaseBuilder(Generic[ODT, BT, CCT, UD, CD, BD, JQ, PT]): # pylint reports false positives here: - # pylint: disable=unused-private-member __slots__ = ( '_token', diff --git a/telegram/ext/_dispatcher.py b/telegram/ext/_dispatcher.py index e5b48acebd0..48c85d4a32e 100644 --- a/telegram/ext/_dispatcher.py +++ b/telegram/ext/_dispatcher.py @@ -51,8 +51,8 @@ from telegram.ext._utils.stack import was_called_by if TYPE_CHECKING: - from .jobqueue import Job - from .builders import InitDispatcherBuilder + from telegram.ext._jobqueue import Job + from telegram.ext._builders import InitDispatcherBuilder DEFAULT_GROUP: int = 0 diff --git a/telegram/ext/_updater.py b/telegram/ext/_updater.py index e9b89cceb8d..97a7d642c76 100644 --- a/telegram/ext/_updater.py +++ b/telegram/ext/_updater.py @@ -46,7 +46,7 @@ from telegram.ext._utils.types import BT if TYPE_CHECKING: - from .builders import InitUpdaterBuilder + from telegram.ext._builders import InitUpdaterBuilder DT = TypeVar('DT', bound=Union[None, Dispatcher]) diff --git a/telegram/ext/filters.py b/telegram/ext/filters.py index 26014b96f48..0f09163bbd9 100644 --- a/telegram/ext/filters.py +++ b/telegram/ext/filters.py @@ -2072,6 +2072,7 @@ def filter(self, message: Message) -> bool: class _Dice(_DiceEmoji): __slots__ = () + # pylint: disable=no-member dice = _DiceEmoji(DiceEmoji.DICE, DiceEmoji.DICE.name.lower()) darts = _DiceEmoji(DiceEmoji.DARTS, DiceEmoji.DARTS.name.lower()) basketball = _DiceEmoji(DiceEmoji.BASKETBALL, DiceEmoji.BASKETBALL.name.lower()) From 07e8f21faa8044f80f765b76ea5255d1c6d38f5b Mon Sep 17 00:00:00 2001 From: Harshil <37377066+harshil21@users.noreply.github.com> Date: Wed, 27 Oct 2021 19:52:47 +0530 Subject: [PATCH 2/3] update dev dependency versions --- .pre-commit-config.yaml | 8 ++++---- requirements-dev.txt | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e2f03a609ec..49d0ec065da 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,18 +3,18 @@ # * the additional_dependencies here match requirements.txt repos: - repo: https://github.com/psf/black - rev: 20.8b1 + rev: 21.9b0 hooks: - id: black args: - --diff - --check - repo: https://gitlab.com/pycqa/flake8 - rev: 3.9.2 + rev: 4.0.1 hooks: - id: flake8 - repo: https://github.com/PyCQA/pylint - rev: v2.10.2 + rev: v2.11.1 hooks: - id: pylint files: ^(telegram|examples)/.*\.py$ @@ -56,7 +56,7 @@ repos: - cachetools==4.2.2 - . # this basically does `pip install -e .` - repo: https://github.com/asottile/pyupgrade - rev: v2.24.0 + rev: v2.29.0 hooks: - id: pyupgrade files: ^(telegram|examples|tests)/.*\.py$ diff --git a/requirements-dev.txt b/requirements-dev.txt index f8fd1bbc0f8..4509641df54 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,13 +3,13 @@ cryptography!=3.4,!=3.4.1,!=3.4.2,!=3.4.3 pre-commit # Make sure that the versions specified here match the pre-commit settings! -black==20.8b1 -flake8==3.9.2 -pylint==2.10.2 +black==21.9b0 +flake8==4.0.1 +pylint==2.11.1 mypy==0.910 -pyupgrade==2.24.0 +pyupgrade==2.29.0 -pytest==6.2.4 +pytest==6.2.5 flaky beautifulsoup4 From 74a7c100e71a9b593d36e80bf389ca6ea179de26 Mon Sep 17 00:00:00 2001 From: Harshil <37377066+harshil21@users.noreply.github.com> Date: Wed, 27 Oct 2021 22:39:45 +0530 Subject: [PATCH 3/3] fix another failing pylint test --- telegram/_bot.py | 4 +--- telegram/error.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/telegram/_bot.py b/telegram/_bot.py index 125cd88e855..f2508bae329 100644 --- a/telegram/_bot.py +++ b/telegram/_bot.py @@ -2259,9 +2259,7 @@ def get_file( if result.get('file_path') and not is_local_file( # type: ignore[union-attr] result['file_path'] # type: ignore[index] ): - result['file_path'] = '{}/{}'.format( # type: ignore[index] - self.base_file_url, result['file_path'] # type: ignore[index] - ) + result['file_path'] = f"{self.base_file_url}/{result['file_path']}" # type: ignore return File.de_json(result, self) # type: ignore[return-value, arg-type] diff --git a/telegram/error.py b/telegram/error.py index 431de67fcf8..9bc4649eeb8 100644 --- a/telegram/error.py +++ b/telegram/error.py @@ -54,7 +54,7 @@ def __init__(self, message: str): self.message = msg def __str__(self) -> str: - return '%s' % self.message + return self.message def __reduce__(self) -> Tuple[type, Tuple[str]]: return self.__class__, (self.message,)