From 0d0a276d98957a5f710857db877e606a37e9a5fd Mon Sep 17 00:00:00 2001 From: Edwin Yllanes Date: Wed, 2 Mar 2022 01:40:42 +0000 Subject: [PATCH 1/4] chore(console/application): remove type errors --- pyproject.toml | 1 - src/poetry/console/application.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6d46412174a..d2432c7e013 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -112,7 +112,6 @@ files = "src" [[tool.mypy.overrides]] module = [ 'poetry.config.file_config_source', - 'poetry.console.application', 'poetry.console.logging.formatters.builder_formatter', 'poetry.console.commands.init', 'poetry.inspection.info', diff --git a/src/poetry/console/application.py b/src/poetry/console/application.py index 1d17c55d805..0911e9e07ff 100644 --- a/src/poetry/console/application.py +++ b/src/poetry/console/application.py @@ -93,7 +93,7 @@ class Application(BaseApplication): def __init__(self) -> None: super().__init__("poetry", __version__) - self._poetry = None + self._poetry: Poetry | None = None self._io: IO | None = None self._disable_plugins = False self._plugins_loaded = False @@ -232,8 +232,8 @@ def register_command_loggers( handler = IOHandler(io) handler.setFormatter(IOFormatter()) - for logger in loggers: - logger = logging.getLogger(logger) + for name in loggers: + logger = logging.getLogger(name) logger.handlers = [handler] From c98b8dcf7a63f844c25acddf68453c54da92fffa Mon Sep 17 00:00:00 2001 From: Edwin Yllanes Date: Wed, 2 Mar 2022 01:54:55 +0000 Subject: [PATCH 2/4] chore(console/logging): remove type errors --- pyproject.toml | 1 - src/poetry/console/logging/formatters/formatter.py | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d2432c7e013..bd981cb44f3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -112,7 +112,6 @@ files = "src" [[tool.mypy.overrides]] module = [ 'poetry.config.file_config_source', - 'poetry.console.logging.formatters.builder_formatter', 'poetry.console.commands.init', 'poetry.inspection.info', 'poetry.installation.chef', diff --git a/src/poetry/console/logging/formatters/formatter.py b/src/poetry/console/logging/formatters/formatter.py index 8f2fb060696..8b595137894 100644 --- a/src/poetry/console/logging/formatters/formatter.py +++ b/src/poetry/console/logging/formatters/formatter.py @@ -1,12 +1,6 @@ from __future__ import annotations -from typing import TYPE_CHECKING - - -if TYPE_CHECKING: - import logging - class Formatter: - def format(self, record: logging.LogRecord) -> str: + def format(self, record: str) -> str: raise NotImplementedError() From 9d82be920ea3d3c0fb0b818b29a1be3b82819b1c Mon Sep 17 00:00:00 2001 From: Edwin Yllanes Date: Wed, 2 Mar 2022 17:59:07 +0000 Subject: [PATCH 3/4] chore(utils/setup_reader): some fixes --- .pre-commit-config.yaml | 1 + src/poetry/utils/setup_reader.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0152ce96069..2faf5343e0c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -87,6 +87,7 @@ repos: pass_filenames: false additional_dependencies: - types-requests + - typed-ast - repo: https://github.com/pre-commit/pre-commit rev: v2.17.0 diff --git a/src/poetry/utils/setup_reader.py b/src/poetry/utils/setup_reader.py index baac42c12ff..dbb9fd104a4 100644 --- a/src/poetry/utils/setup_reader.py +++ b/src/poetry/utils/setup_reader.py @@ -312,6 +312,7 @@ def _find_single_string( if variable is not None and isinstance(variable, ast.Str): return variable.s + return None def _find_in_call(self, call: ast.Call, name: str) -> Any | None: for keyword in call.keywords: @@ -342,8 +343,9 @@ def _find_variable_in_body(self, body: Iterable[Any], name: str) -> Any | None: if target.id == name: return elem.value + return None - def _find_in_dict(self, dict_: ast.Dict | ast.Call, name: str) -> Any | None: + def _find_in_dict(self, dict_: ast.Dict, name: str) -> Any | None: for key, val in zip(dict_.keys, dict_.values): if isinstance(key, ast.Str) and key.s == name: return val From b8c7f0763d532e2cc965ad61cba5d6deca58bf68 Mon Sep 17 00:00:00 2001 From: Edwin Yllanes Date: Wed, 2 Mar 2022 18:01:19 +0000 Subject: [PATCH 4/4] Revert "chore(utils/setup_reader): some fixes" This reverts commit 9d82be920ea3d3c0fb0b818b29a1be3b82819b1c. --- .pre-commit-config.yaml | 1 - src/poetry/utils/setup_reader.py | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2faf5343e0c..0152ce96069 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -87,7 +87,6 @@ repos: pass_filenames: false additional_dependencies: - types-requests - - typed-ast - repo: https://github.com/pre-commit/pre-commit rev: v2.17.0 diff --git a/src/poetry/utils/setup_reader.py b/src/poetry/utils/setup_reader.py index dbb9fd104a4..baac42c12ff 100644 --- a/src/poetry/utils/setup_reader.py +++ b/src/poetry/utils/setup_reader.py @@ -312,7 +312,6 @@ def _find_single_string( if variable is not None and isinstance(variable, ast.Str): return variable.s - return None def _find_in_call(self, call: ast.Call, name: str) -> Any | None: for keyword in call.keywords: @@ -343,9 +342,8 @@ def _find_variable_in_body(self, body: Iterable[Any], name: str) -> Any | None: if target.id == name: return elem.value - return None - def _find_in_dict(self, dict_: ast.Dict, name: str) -> Any | None: + def _find_in_dict(self, dict_: ast.Dict | ast.Call, name: str) -> Any | None: for key, val in zip(dict_.keys, dict_.values): if isinstance(key, ast.Str) and key.s == name: return val