From: Kefu Chai Date: Thu, 24 Nov 2022 06:01:13 +0000 (+0800) Subject: pybind/mgr: use annotation style without comment X-Git-Tag: v17.2.6~300^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f633c66548e840bd914b7a216683f1e93ff7dbfc;p=ceph.git pybind/mgr: use annotation style without comment * use annotation style without comment * add noqa to import statement to prevent flake8 from complaining those which import typing modules to silence the warnings like: ``` flake8 run-test: commands[0] | flake8 --config=tox.ini alerts balancer cephadm cli_api crash devicehealth diskprediction_local hello iostat localpool nfs orchestrator prometheus selftest cephadm/schedule.py:5:1: F401 'typing.Callable' imported but unused cephadm/schedule.py:8:1: F401 'ceph.deployment.service_spec.ServiceSpec' imported but unused cephadm/tests/fixtures.py:17:1: F401 'orchestrator.OrchResult' imported but unused orchestrator/module.py:4:1: F401 'typing.Set' imported but unused orchestrator/module.py:17:1: F401 'ceph.deployment.inventory.Device' imported but unused prometheus/module.py:17:1: F401 'typing.DefaultDict' imported but unused 6 F401 'typing.Callable' imported but unused ERROR: InvocationError for command /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/.tox/flake8/bin/flake8 --config=tox.ini alerts ``` Signed-off-by: Kefu Chai (cherry picked from commit 7894e7bdd1c25d86a71e3dcdc88c46062cb31101) --- diff --git a/src/pybind/mgr/cephadm/schedule.py b/src/pybind/mgr/cephadm/schedule.py index 692b4282e860..09c8c4e43cdc 100644 --- a/src/pybind/mgr/cephadm/schedule.py +++ b/src/pybind/mgr/cephadm/schedule.py @@ -141,13 +141,13 @@ class DaemonPlacement(NamedTuple): class HostAssignment(object): def __init__(self, - spec, # type: ServiceSpec + spec: ServiceSpec, hosts: List[orchestrator.HostSpec], unreachable_hosts: List[orchestrator.HostSpec], draining_hosts: List[orchestrator.HostSpec], daemons: List[orchestrator.DaemonDescription], networks: Dict[str, Dict[str, Dict[str, List[str]]]] = {}, - filter_new_host=None, # type: Optional[Callable[[str],bool]] + filter_new_host: Optional[Callable[[str], bool]] = None, allow_colo: bool = False, primary_daemon_type: Optional[str] = None, per_host_daemon_type: Optional[str] = None, diff --git a/src/pybind/mgr/cephadm/tests/fixtures.py b/src/pybind/mgr/cephadm/tests/fixtures.py index 0567f7f7e68a..cabd904a15e2 100644 --- a/src/pybind/mgr/cephadm/tests/fixtures.py +++ b/src/pybind/mgr/cephadm/tests/fixtures.py @@ -133,8 +133,7 @@ def with_cephadm_module(module_options=None, store=None): yield m -def wait(m, c): - # type: (CephadmOrchestrator, OrchResult) -> Any +def wait(m: CephadmOrchestrator, c: OrchResult) -> Any: return raise_if_exception(c) diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index f8d2d2d7b876..2672abcf8f03 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -14,7 +14,7 @@ except ImportError: # fallback to normal sort natsorted = sorted # type: ignore -from ceph.deployment.inventory import Device +from ceph.deployment.inventory import Device # noqa: F401; pylint: disable=unused-variable from ceph.deployment.drive_group import DriveGroupSpec, DeviceSelection, OSDMethod from ceph.deployment.service_spec import PlacementSpec, ServiceSpec, service_spec_allow_invalid_from_json from ceph.deployment.hostspec import SpecValidationError @@ -215,8 +215,8 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule, def __init__(self, *args: Any, **kwargs: Any) -> None: super(OrchestratorCli, self).__init__(*args, **kwargs) - self.ident = set() # type: Set[str] - self.fault = set() # type: Set[str] + self.ident: Set[str] = set() + self.fault: Set[str] = set() self._load() self._refresh_health() diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py index ee79951123d1..385e39d276a3 100644 --- a/src/pybind/mgr/prometheus/module.py +++ b/src/pybind/mgr/prometheus/module.py @@ -1043,7 +1043,7 @@ class Module(MgrModule): pg_summary = self.get('pg_summary') for pool in pg_summary['by_pool']: - num_by_state = defaultdict(int) # type: DefaultDict[str, int] + num_by_state: DefaultDict[str, int] = defaultdict(int) for state_name, count in pg_summary['by_pool'][pool].items(): for state in state_name.split('+'):