From 148ca82f7483f6564d23472f25733fc1eb743c5e Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Mon, 20 Jul 2020 13:55:09 +0200
Subject: [PATCH] cephadm: use src/mypy.ini instead

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---
 src/cephadm/cephadm  | 22 +++++++++++-----------
 src/cephadm/mypy.ini |  2 --
 src/cephadm/tox.ini  |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 src/cephadm/mypy.ini

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index e3a9cd39d2f..b23962c56b7 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -732,8 +732,8 @@ class FileLock(object):
         #   https://stackoverflow.com/questions/17708885/flock-removing-locked-file-without-race-condition
         fd = self._lock_file_fd
         self._lock_file_fd = None
-        fcntl.flock(fd, fcntl.LOCK_UN)
-        os.close(fd)
+        fcntl.flock(fd, fcntl.LOCK_UN)  # type: ignore
+        os.close(fd)  # type: ignore
         return None
 
 
@@ -1112,7 +1112,7 @@ def infer_fsid(func):
             logger.debug('Using specified fsid: %s' % args.fsid)
             return func()
 
-        fsids = set()
+        fsids_set = set()
         daemon_list = list_daemons(detail=False)
         for daemon in daemon_list:
             if not is_fsid(daemon['fsid']):
@@ -1120,11 +1120,11 @@ def infer_fsid(func):
                 continue
             elif 'name' not in args or not args.name:
                 # args.name not specified
-                fsids.add(daemon['fsid'])
+                fsids_set.add(daemon['fsid'])
             elif daemon['name'] == args.name:
                 # args.name is a match
-                fsids.add(daemon['fsid'])
-        fsids = sorted(fsids)
+                fsids_set.add(daemon['fsid'])
+        fsids = sorted(fsids_set)
 
         if not fsids:
             # some commands do not always require an fsid
@@ -1300,7 +1300,7 @@ def make_var_run(fsid, uid, gid):
 
 
 def copy_tree(src, dst, uid=None, gid=None):
-    # type: (List[str], str, int, int) -> None
+    # type: (List[str], str, Optional[int], Optional[int]) -> None
     """
     Copy a directory tree from src to dst
     """
@@ -1325,7 +1325,7 @@ def copy_tree(src, dst, uid=None, gid=None):
 
 
 def copy_files(src, dst, uid=None, gid=None):
-    # type: (List[str], str, int, int) -> None
+    # type: (List[str], str, Optional[int], Optional[int]) -> None
     """
     Copy a files from src to dst
     """
@@ -1345,7 +1345,7 @@ def copy_files(src, dst, uid=None, gid=None):
 
 
 def move_files(src, dst, uid=None, gid=None):
-    # type: (List[str], str, int, int) -> None
+    # type: (List[str], str, Optional[int], Optional[int]) -> None
     """
     Move files from src to dst
     """
@@ -1486,7 +1486,7 @@ def check_units(units, enabler=None):
 
 
 def get_legacy_config_fsid(cluster, legacy_dir=None):
-    # type: (str, str) -> Optional[str]
+    # type: (str, Optional[str]) -> Optional[str]
     config_file = '/etc/ceph/%s.conf' % cluster
     if legacy_dir is not None:
         config_file = os.path.abspath(legacy_dir + config_file)
@@ -1499,7 +1499,7 @@ def get_legacy_config_fsid(cluster, legacy_dir=None):
 
 
 def get_legacy_daemon_fsid(cluster, daemon_type, daemon_id, legacy_dir=None):
-    # type: (str, str, Union[int, str], str) -> Optional[str]
+    # type: (str, str, Union[int, str], Optional[str]) -> Optional[str]
     fsid = None
     if daemon_type == 'osd':
         try:
diff --git a/src/cephadm/mypy.ini b/src/cephadm/mypy.ini
deleted file mode 100644
index 313abc807e9..00000000000
--- a/src/cephadm/mypy.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[mypy]
-ignore_missing_imports = False
diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini
index 3c7180ff9a5..be0ab4ddfd4 100644
--- a/src/cephadm/tox.ini
+++ b/src/cephadm/tox.ini
@@ -13,4 +13,4 @@ commands=pytest {posargs}
 [testenv:mypy]
 basepython = python3
 deps = mypy==0.782
-commands = mypy {posargs:cephadm}
+commands = mypy --config-file ../mypy.ini {posargs:cephadm}
-- 
2.47.3