From ef6e6aeb6796124bded8238860da00972e9aaf10 Mon Sep 17 00:00:00 2001 From: Annie Tallund Date: Tue, 11 Apr 2023 09:29:56 +0200 Subject: MLIA-849 Update mypy version and fix associated issues - Remove unused silencing of typing - Amend None type hints where it is default Change-Id: Id972b56dcdce865bf6c9d6aea88bc76baf39133e --- src/mlia/backend/install.py | 2 +- src/mlia/backend/manager.py | 2 +- src/mlia/core/context.py | 2 +- src/mlia/target/config.py | 2 +- src/mlia/target/cortex_a/reporters.py | 2 +- src/mlia/target/ethos_u/reporters.py | 2 +- src/mlia/target/tosa/reporters.py | 2 +- tox.ini | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mlia/backend/install.py b/src/mlia/backend/install.py index c76e3e2..4745f19 100644 --- a/src/mlia/backend/install.py +++ b/src/mlia/backend/install.py @@ -201,7 +201,7 @@ class PackagePathChecker: self, expected_files: list[str], backend_subfolder: str | None = None, - settings: dict = None, + settings: dict | None = None, ) -> None: """Init the path checker.""" self.expected_files = expected_files diff --git a/src/mlia/backend/manager.py b/src/mlia/backend/manager.py index 5a60f95..a4bc8c0 100644 --- a/src/mlia/backend/manager.py +++ b/src/mlia/backend/manager.py @@ -111,7 +111,7 @@ class InstallationFiltersMixin: """Return list of the backends filtered by name.""" return self.filter_by(SearchByNameFilter(backend_name)) - def already_installed(self, backend_name: str = None) -> list[Installation]: + def already_installed(self, backend_name: str | None = None) -> list[Installation]: """Return list of backends that are already installed.""" return self.filter_by( AlreadyInstalledFilter(), diff --git a/src/mlia/core/context.py b/src/mlia/core/context.py index d3fa606..6e699be 100644 --- a/src/mlia/core/context.py +++ b/src/mlia/core/context.py @@ -105,7 +105,7 @@ class ExecutionContext(Context): def __init__( self, *, - advice_category: set[AdviceCategory] = None, + advice_category: set[AdviceCategory] | None = None, config_parameters: Mapping[str, Any] | None = None, output_dir: str | Path | None = None, event_handlers: list[EventHandler] | None = None, diff --git a/src/mlia/target/config.py b/src/mlia/target/config.py index eb7ecff..3bc74fa 100644 --- a/src/mlia/target/config.py +++ b/src/mlia/target/config.py @@ -16,7 +16,7 @@ from typing import TypeVar try: import tomllib except ModuleNotFoundError: - import tomli as tomllib # type: ignore + import tomli as tomllib from mlia.backend.registry import registry as backend_registry from mlia.core.common import AdviceCategory diff --git a/src/mlia/target/cortex_a/reporters.py b/src/mlia/target/cortex_a/reporters.py index fc80c9f..e7247f5 100644 --- a/src/mlia/target/cortex_a/reporters.py +++ b/src/mlia/target/cortex_a/reporters.py @@ -82,7 +82,7 @@ def cortex_a_formatters(data: Any) -> Callable[[Any], Report]: return report_target if isinstance(data, TFLiteCompatibilityInfo): - return report_tflite_compatiblity # type: ignore + return report_tflite_compatiblity if isinstance(data, CortexACompatibilityInfo): return report_cortex_a_operators diff --git a/src/mlia/target/ethos_u/reporters.py b/src/mlia/target/ethos_u/reporters.py index 4964462..00e68b5 100644 --- a/src/mlia/target/ethos_u/reporters.py +++ b/src/mlia/target/ethos_u/reporters.py @@ -392,4 +392,4 @@ def ethos_u_formatters(data: Any) -> Callable[[Any], Report]: else: raise Exception(f"Unable to find appropriate formatter for {data}") - return report # type: ignore + return report diff --git a/src/mlia/target/tosa/reporters.py b/src/mlia/target/tosa/reporters.py index decae0c..e10f047 100644 --- a/src/mlia/target/tosa/reporters.py +++ b/src/mlia/target/tosa/reporters.py @@ -166,6 +166,6 @@ def tosa_formatters(data: Any) -> Callable[[Any], Report]: return report_tosa_compatibility if isinstance(data, TFLiteCompatibilityInfo): - return report_tflite_compatiblity # type: ignore + return report_tflite_compatiblity raise Exception(f"Unable to find appropriate formatter for {data}") diff --git a/tox.ini b/tox.ini index af4ab91..9aedfbe 100644 --- a/tox.ini +++ b/tox.ini @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates. +# SPDX-FileCopyrightText: Copyright 2022-2023, Arm Limited and/or its affiliates. # SPDX-License-Identifier: Apache-2.0 [tox] envlist = test @@ -45,7 +45,7 @@ description = Run and setup the pre-commit hooks. envdir={toxworkdir}/lint deps = {[testenv:test]deps} - mypy==0.982 + mypy==1.2.0 pylint==2.15.5 pre-commit # Pass the following environment variables: -- cgit v1.2.1