From bab7abeca119efb3935153a0b13516409c596ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Nesveda?= Date: Wed, 8 Feb 2023 17:20:38 +0100 Subject: [PATCH] Update development dependencies, remove unnecessary `noqa` rules --- .flake8 | 3 ++- setup.py | 28 +++++++++++++-------------- src/apify/_utils.py | 26 ++++++++++++------------- src/apify/storages/key_value_store.py | 6 +++--- src/apify/storages/storage_manager.py | 4 ++-- tests/integration/conftest.py | 8 ++++---- 6 files changed, 38 insertions(+), 37 deletions(-) diff --git a/.flake8 b/.flake8 index 66da48cc..944a8dba 100644 --- a/.flake8 +++ b/.flake8 @@ -20,7 +20,8 @@ ignore = D409 D413 U101 -ignore-decorators = _make_async_docs +unused-arguments-ignore-overload-functions = True +unused-arguments-ignore-stub-functions = True per-file-ignores = docs/*: D scripts/*: D diff --git a/setup.py b/setup.py index b9d6ddc2..7d9e64b0 100644 --- a/setup.py +++ b/setup.py @@ -59,36 +59,36 @@ 'websockets ~= 10.4', 'aiofiles ~= 22.1.0', 'aioshutil ~= 1.2', - 'cryptography ~= 39.0.0', + 'cryptography ~= 39.0.1', ], extras_require={ 'dev': [ - 'autopep8 ~= 2.0.0', + 'autopep8 ~= 2.0.1', 'filelock ~= 3.9.0', - 'flake8 ~= 5.0.4', - 'flake8-bugbear ~= 22.10.27', + 'flake8 ~= 6.0.0', + 'flake8-bugbear ~= 23.1.20', 'flake8-commas ~= 2.1.0', - 'flake8-docstrings ~= 1.6.0', - 'flake8-isort ~= 5.0.3', + 'flake8-docstrings ~= 1.7.0', + 'flake8-isort ~= 6.0.0', 'flake8-quotes ~= 3.3.1', - 'flake8-unused-arguments ~= 0.0.12', - 'isort ~= 5.10.1', - 'mypy ~= 0.991', + 'flake8-unused-arguments ~= 0.0.13', # TODO: remove overload noqa + 'isort ~= 5.12.0', + 'mypy ~= 1.0.0', 'pep8-naming ~= 0.13.2', - 'pre-commit ~= 2.20.0', + 'pre-commit ~= 3.0.1', 'pytest ~= 7.2.0', 'pytest-asyncio ~= 0.20.3', 'pytest-only ~= 2.0.0', 'pytest-randomly ~= 3.12.0', 'pytest-timeout ~= 2.1.0', - 'pytest-xdist ~= 3.1.0', + 'pytest-xdist ~= 3.2.0', 'respx ~= 0.20.1', - 'sphinx ~= 5.3.0', - 'sphinx-autodoc-typehints ~= 1.19.5', + 'sphinx ~= 6.1.3', + 'sphinx-autodoc-typehints ~= 1.22', 'sphinx-markdown-builder == 0.5.4', # pinned to 0.5.4, because 0.5.5 has a formatting bug 'types-aiofiles ~= 22.1.0.4', 'types-psutil ~= 5.9.5.5', - 'types-setuptools ~= 65.6.0.1', + 'types-setuptools', # always latest, since we always install latest setuptools ], }, ) diff --git a/src/apify/_utils.py b/src/apify/_utils.py index 9eb1e69c..5590f900 100644 --- a/src/apify/_utils.py +++ b/src/apify/_utils.py @@ -96,57 +96,57 @@ def _maybe_extract_enum_member_value(maybe_enum_member: Any) -> Any: @overload -def _fetch_and_parse_env_var(env_var: _BOOL_ENV_VARS_TYPE) -> Optional[bool]: # noqa: U100 +def _fetch_and_parse_env_var(env_var: _BOOL_ENV_VARS_TYPE) -> Optional[bool]: ... @overload -def _fetch_and_parse_env_var(env_var: _BOOL_ENV_VARS_TYPE, default: bool) -> bool: # noqa: U100 +def _fetch_and_parse_env_var(env_var: _BOOL_ENV_VARS_TYPE, default: bool) -> bool: ... @overload -def _fetch_and_parse_env_var(env_var: _DATETIME_ENV_VARS_TYPE) -> Optional[Union[datetime, str]]: # noqa: U100 +def _fetch_and_parse_env_var(env_var: _DATETIME_ENV_VARS_TYPE) -> Optional[Union[datetime, str]]: ... @overload -def _fetch_and_parse_env_var(env_var: _DATETIME_ENV_VARS_TYPE, default: datetime) -> Union[datetime, str]: # noqa: U100 +def _fetch_and_parse_env_var(env_var: _DATETIME_ENV_VARS_TYPE, default: datetime) -> Union[datetime, str]: ... @overload -def _fetch_and_parse_env_var(env_var: _FLOAT_ENV_VARS_TYPE) -> Optional[float]: # noqa: U100 +def _fetch_and_parse_env_var(env_var: _FLOAT_ENV_VARS_TYPE) -> Optional[float]: ... @overload -def _fetch_and_parse_env_var(env_var: _FLOAT_ENV_VARS_TYPE, default: float) -> float: # noqa: U100 +def _fetch_and_parse_env_var(env_var: _FLOAT_ENV_VARS_TYPE, default: float) -> float: ... @overload -def _fetch_and_parse_env_var(env_var: _INTEGER_ENV_VARS_TYPE) -> Optional[int]: # noqa: U100 +def _fetch_and_parse_env_var(env_var: _INTEGER_ENV_VARS_TYPE) -> Optional[int]: ... @overload -def _fetch_and_parse_env_var(env_var: _INTEGER_ENV_VARS_TYPE, default: int) -> int: # noqa: U100 +def _fetch_and_parse_env_var(env_var: _INTEGER_ENV_VARS_TYPE, default: int) -> int: ... @overload -def _fetch_and_parse_env_var(env_var: _STRING_ENV_VARS_TYPE, default: str) -> str: # noqa: U100 +def _fetch_and_parse_env_var(env_var: _STRING_ENV_VARS_TYPE, default: str) -> str: ... @overload -def _fetch_and_parse_env_var(env_var: _STRING_ENV_VARS_TYPE) -> Optional[str]: # noqa: U100 +def _fetch_and_parse_env_var(env_var: _STRING_ENV_VARS_TYPE) -> Optional[str]: ... @overload -def _fetch_and_parse_env_var(env_var: ApifyEnvVars) -> Optional[Any]: # noqa: U100 +def _fetch_and_parse_env_var(env_var: ApifyEnvVars) -> Optional[Any]: ... @@ -402,12 +402,12 @@ def _is_running_in_ipython() -> bool: @overload -def _budget_ow(value: Union[str, int, float, bool], predicate: Tuple[Type, bool], value_name: str) -> None: # noqa: U100 +def _budget_ow(value: Union[str, int, float, bool], predicate: Tuple[Type, bool], value_name: str) -> None: ... @overload -def _budget_ow(value: Dict, predicate: Dict[str, Tuple[Type, bool]]) -> None: # noqa: U100 +def _budget_ow(value: Dict, predicate: Dict[str, Tuple[Type, bool]]) -> None: ... diff --git a/src/apify/storages/key_value_store.py b/src/apify/storages/key_value_store.py index 202e64ad..ea99038f 100644 --- a/src/apify/storages/key_value_store.py +++ b/src/apify/storages/key_value_store.py @@ -81,17 +81,17 @@ def _get_default_name(cls, config: Configuration) -> str: @overload @classmethod - async def get_value(cls, key: str) -> Any: # noqa: U100 + async def get_value(cls, key: str) -> Any: ... @overload @classmethod - async def get_value(cls, key: str, default_value: T) -> T: # noqa: U100 + async def get_value(cls, key: str, default_value: T) -> T: ... @overload @classmethod - async def get_value(cls, key: str, default_value: Optional[T] = None) -> Optional[T]: # noqa: U100 + async def get_value(cls, key: str, default_value: Optional[T] = None) -> Optional[T]: ... @classmethod diff --git a/src/apify/storages/storage_manager.py b/src/apify/storages/storage_manager.py index 3570c449..d93a7333 100644 --- a/src/apify/storages/storage_manager.py +++ b/src/apify/storages/storage_manager.py @@ -18,11 +18,11 @@ class Storage(Protocol[T]): """A protocol defining common interface for storage classes.""" @classmethod - def _create_instance(cls, storage_id_or_name: str, client: Union[ApifyClientAsync, MemoryStorage]) -> T: # noqa: U100 + def _create_instance(cls, storage_id_or_name: str, client: Union[ApifyClientAsync, MemoryStorage]) -> T: ... @classmethod - def _get_default_name(cls, config: Configuration) -> str: # noqa: U100 + def _get_default_name(cls, config: Configuration) -> str: ... diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index d7e5c936..d325bc4f 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -108,11 +108,11 @@ def actor_base_source_files(sdk_wheel_path: Path) -> Dict[str, Union[str, bytes] class ActorFactory(Protocol): def __call__( self, - actor_label: str, # noqa: U100 + actor_label: str, *, - main_func: Optional[Callable] = None, # noqa: U100 - main_py: Optional[str] = None, # noqa: U100 - source_files: Optional[Mapping[str, Union[str, bytes]]] = None, # noqa: U100 + main_func: Optional[Callable] = None, + main_py: Optional[str] = None, + source_files: Optional[Mapping[str, Union[str, bytes]]] = None, ) -> Awaitable[ActorClientAsync]: ...