Merge pull request #49040 from tchaikov/wip-cephadm-flake8

cephadm: pin flake8 to 5.0.4

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

qa/tasks/cephfs/test_full.py

@@ -2,11 +2,7 @@
 import logging
 import os
 from textwrap import dedent
-try:
-    from typing import Optional
-except:
-    # make it work for python2
-    pass
+from typing import Optional
 from teuthology.exceptions import CommandFailedError
 from tasks.cephfs.fuse_mount import FuseMount
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
@@ -22,7 +18,7 @@ class FullnessTestCase(CephFSTestCase):
     data_only = False
 
     # Subclasses define how many bytes should be written to achieve fullness
-    pool_capacity = None  # type: Optional[int]
+    pool_capacity: Optional[int] = None
     fill_mb = None
 
     def is_full(self):

src/cephadm/tox.ini

@@ -59,7 +59,7 @@ commands =
 basepython = python3
 allowlist_externals = bash
 deps =
-    flake8
+    flake8 == 5.0.4
     flake8-quotes
 commands =
     flake8 --config=tox.ini {posargs:cephadm.py}

src/pybind/mgr/cephadm/schedule.py

@@ -141,13 +141,13 @@ def matches_rank_map(
 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,

src/pybind/mgr/cephadm/tests/fixtures.py

@@ -134,8 +134,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)
 
 

src/pybind/mgr/orchestrator/module.py

@@ -14,7 +14,7 @@
     # 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, TracingSpec
 from ceph.deployment.hostspec import SpecValidationError
@@ -227,8 +227,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()
 

src/pybind/mgr/prometheus/module.py

@@ -1043,7 +1043,7 @@ def get_pg_status(self) -> None:
         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('+'):