Some small fixes in typing and mypy config (#527)

Author: mxsasha

.gitignore

@@ -1,11 +1,22 @@
 .DS_Store
-.coverage
+
 .idea
+.vscode
+
 .mypy_cache
-.tmpdirs
 .pytest_cache
+.tmpdirs
+
 local_config.yaml
 
+.coverage
+cov.xml
+
+build
+dist
+gnupg
+irrd.egg-info
+
 syntax: glob
 __pycache__
 _build

docs/development/development-setup.rst

@@ -85,7 +85,7 @@ Mypy and flake8
 In addition to the tests, this project uses `mypy` for type checking and `flake8`
 for style checking. To run these, run::
 
-    mypy irrd --ignore-missing-imports
+    mypy irrd
     flake8
 
 If all is well, neither command should provide output.

irrd/conf/__init__.py

@@ -142,7 +142,7 @@ class ConfigurationError(ValueError):
 # testing_overrides can be set to a DottedDict, and is used
 # to override settings while testing, using the config_override
 # fixture.
-testing_overrides = None
+testing_overrides: Any = None
 
 
 class Configuration:
@@ -174,7 +174,7 @@ def __init__(self, user_config_path: Optional[str]=None, commit=True):
             logfile_path = self.get_setting_live('log.logfile_path')
             if logging_config_path:
                 spec = importlib.util.spec_from_file_location("logging_config", logging_config_path)
-                config_module = importlib.util.module_from_spec(spec)
+                config_module = importlib.util.module_from_spec(spec)  # type: ignore
                 spec.loader.exec_module(config_module)  # type: ignore
                 self.logging_config = config_module.LOGGING  # type: ignore
                 logging.config.dictConfig(self.logging_config)
@@ -427,7 +427,7 @@ def _check_is_str(self, config, key, required=True):
         return config.get(key) is None or isinstance(config.get(key), str)
 
 
-configuration = None
+configuration: Optional[Configuration] = None
 
 
 def get_configuration() -> Optional[Configuration]:

irrd/daemon/main.py

@@ -171,7 +171,7 @@ def sigterm_handler(signum, frame):
     logging.info(f'Main process exiting')
 
 
-def get_configured_owner() -> Tuple[int, int]:
+def get_configured_owner() -> Tuple[Optional[int], Optional[int]]:
     uid = gid = None
     user = get_setting('user')
     group = get_setting('group')

irrd/mirroring/parsers.py

@@ -292,7 +292,7 @@ class NRTMStreamParser(MirrorParser):
     """
     first_serial = -1
     last_serial = -1
-    nrtm_source = None
+    nrtm_source: Optional[str] = None
     _current_op_serial = -1
 
     def __init__(self, source: str, nrtm_data: str, database_handler: DatabaseHandler) -> None:

irrd/scripts/rpsl_read.py

@@ -8,7 +8,7 @@
 import sys
 
 from pathlib import Path
-from typing import Set
+from typing import Optional, Set
 
 from irrd.storage.models import JournalEntryOrigin
 
@@ -26,7 +26,7 @@ class RPSLParse:
     obj_errors = 0
     obj_unknown = 0
     unknown_object_classes: Set[str] = set()
-    database_handler = None
+    database_handler: Optional[DatabaseHandler] = None
 
     def main(self, filename, strict_validation, database, show_info=True):
         self.show_info = show_info

irrd/storage/__init__.py

@@ -6,7 +6,7 @@
 
 from irrd.conf import get_setting
 
-engine = None
+engine: sa.engine.Engine = None
 
 
 def get_engine():

setup.cfg

@@ -32,3 +32,9 @@ omit =
 
 [tool:pytest]
 log_level=DEBUG
+
+[mypy]
+ignore_missing_imports = True
+install_types = True
+non_interactive = True
+exclude = irrd/storage/alembic/*