Merge branch 'flake8/more-tests' of github.com:iocage/libiocage into flake8/more-tests

Author: gronke

iocage/lib/Config/Jail/BaseConfig.py

@@ -215,7 +215,7 @@ def _set_priority(self, value: typing.Union[int, str], **kwargs):
         self.data["priority"] = str(value)
 
     # legacy support
-    def _get_tag(self) -> str:
+    def _get_tag(self) -> typing.Optional[str]:
 
         if self._has_legacy_tag is True:
             return self.data["tag"]
@@ -396,7 +396,7 @@ def _skip_on_error(self, **kwargs):
         except AttributeError:
             return False
 
-    def __getitem_user(self, key):
+    def __getitem_user(self, key: str) -> typing.Any:
 
         # passthrough existing properties
         try:

iocage/lib/Jail.py

@@ -1056,7 +1056,7 @@ def running(self) -> bool:
         return self.jid is not None
 
     @property
-    def jid(self) -> int:
+    def jid(self) -> typing.Optional[int]:
         """
         The JID of a running jail or None if the jail is not running
         """

iocage/lib/Release.py

@@ -116,7 +116,7 @@ def base_dataset_name(self) -> str:
         return f"{self.__base_dataset_name}/{self.release.name}/root"
 
     @property
-    def file(self) -> str:
+    def file(self) -> typing.Optional[str]:
         return None
 
 

iocage/lib/Resource.py

@@ -181,7 +181,7 @@ def _set_dataset(self, value: libzfs.ZFSDataset) -> None:
     #     return self.dataset.mountpoint
 
     @property
-    def config_type(self) -> str:
+    def config_type(self) -> typing.Optional[str]:
         if self._config_type is None:
             return None
         elif self._config_type == self.CONFIG_TYPES.index("auto"):
@@ -209,7 +209,7 @@ def _detect_config_type(self) -> int:
         return 0
 
     @property
-    def config_file(self) -> str:
+    def config_file(self) -> typing.Optional[str]:
         """
         Relative path of the resource config file
         """

iocage/lib/events.py

@@ -48,13 +48,13 @@ class IocageEvent:
 
     PENDING_COUNT: int = 0
 
-    identifier: str = None
-    _started_at: float = None
-    _stopped_at: float = None
+    identifier: str
+    _started_at: float
+    _stopped_at: float
     _pending: bool = False
     skipped: bool = False
     done: bool = True
-    error: BaseException = None
+    error: BaseException
 
     def __init__(self, message=None, **kwargs) -> None:
         """

setup.cfg

@@ -3,6 +3,11 @@ description-file = README.md
 
 [mypy]
 python_version = 3.6
+# override flake8-mypy defaults, since we provide (missing) types
+ignore_missing_imports=False
+disallow_untyped_calls=True
+follow_imports=True
+cache_dir=.mypy_cache
 
 [tool:pytest]
 addopts = -v -x -rs --ignore=setup.py --pep8 --cov-report term-missing --cov=iocage/lib iocage/lib iocage/tests