Improve mypy type checking

.pre-commit-config.yaml

@@ -38,7 +38,7 @@ repos:
         entry: mypy
         language: python
         types: [python]
-        args: [--scripts-are-modules]
+        args: [--scripts-are-modules, --warn-unused-ignores]
         require_serial: true
         pass_filenames: true
         files: >-

aiida/common/progress_reporter.py

@@ -130,7 +130,7 @@ def get_progress_reporter() -> Type[ProgressReporterAbstract]:
 
     """
     global PROGRESS_REPORTER
-    return PROGRESS_REPORTER  # type: ignore
+    return PROGRESS_REPORTER
 
 
 def set_progress_reporter(reporter: Optional[Type[ProgressReporterAbstract]] = None, **kwargs: Any):
@@ -154,11 +154,11 @@ def set_progress_reporter(reporter: Optional[Type[ProgressReporterAbstract]] = N
     """
     global PROGRESS_REPORTER
     if reporter is None:
-        PROGRESS_REPORTER = ProgressReporterNull  # type: ignore
+        PROGRESS_REPORTER = ProgressReporterNull
     elif kwargs:
         PROGRESS_REPORTER = partial(reporter, **kwargs)  # type: ignore
     else:
-        PROGRESS_REPORTER = reporter  # type: ignore
+        PROGRESS_REPORTER = reporter
 
 
 def set_progress_bar_tqdm(bar_format: Optional[str] = TQDM_BAR_FORMAT, leave: Optional[bool] = False, **kwargs: Any):

aiida/tools/importexport/archive/writers.py

@@ -261,8 +261,9 @@ def open(self):
         # create a temporary folder in which to perform the write
         self._temp_path: Path = Path(tempfile.mkdtemp())
         # open a zipfile in in write mode to export to
+        self._zipinfo_cache: Optional[dict]
         if self._cache_zipinfo:
-            self._zipinfo_cache = shelve.open(str(self._temp_path / 'zipinfo_cache'))
+            self._zipinfo_cache = shelve.open(str(self._temp_path / 'zipinfo_cache'))  # type: ignore
         else:
             self._zipinfo_cache = None
         self._archivepath: ZipPath = ZipPath(
@@ -289,7 +290,7 @@ def close(self, excepted: bool):
         # close the zipfile to finalise write
         self._archivepath.close()
         if getattr(self, '_zipinfo_cache', None) is not None:
-            self._zipinfo_cache.close()
+            self._zipinfo_cache.close()  # type: ignore
             delattr(self, '_zipinfo_cache')
         # move the compressed file to the final path
         self._remove_filepath()

aiida/tools/importexport/dbexport/__init__.py

@@ -402,8 +402,8 @@ def _get_starting_node_ids(entities: List[Any]) -> Tuple[DefaultDict[str, Set[st
                     pks.append(pk)
                     uuids.append(uuid)
 
-            entities_starting_set[NODE_ENTITY_NAME].update(uuids)  # type: ignore
-            given_node_entry_ids.update(pks)  # type: ignore
+            entities_starting_set[NODE_ENTITY_NAME].update(uuids)
+            given_node_entry_ids.update(pks)
 
     return entities_starting_set, given_node_entry_ids
 

mypy.ini

@@ -3,7 +3,6 @@
 [mypy]
 python_version = 3.6
 
-follow_imports = skip
 check_untyped_defs = True
 
 ; Strictness settings
@@ -31,6 +30,10 @@ check_untyped_defs = True
 ; allow_untyped_globals = False
 ; strict_equality = True
 
+[mypy-aiida.*]
+; can only follow these imports when more of the code is typed
+follow_imports = skip
+
 [mypy-tests.*]
 check_untyped_defs = False