project management: fix issues with updated type checker, moved more config to pyproject.toml

manager/knot_resolver_manager/utils/types.py

@@ -15,7 +15,7 @@ def is_optional(tp: Any) -> bool:
     origin = getattr(tp, "__origin__", None)
     args = get_generic_type_arguments(tp)
 
-    return origin == Union and len(args) == 2 and args[1] == NoneType
+    return origin == Union and len(args) == 2 and args[1] == NoneType  # type: ignore
 
 
 def is_dict(tp: Any) -> bool:
@@ -36,7 +36,7 @@ def is_tuple(tp: Any) -> bool:
 
 def is_union(tp: Any) -> bool:
     """ Returns true even for optional types, because they are just a Union[T, NoneType] """
-    return getattr(tp, "__origin__", None) == Union
+    return getattr(tp, "__origin__", None) == Union  # type: ignore
 
 
 def is_literal(tp: Any) -> bool:
@@ -77,7 +77,7 @@ def get_attr_type(obj: Any, attr_name: str) -> Any:
 class _LiteralEnum:
     def __getitem__(self, args: Tuple[Union[str, int, bytes], ...]) -> Any:
         lits = tuple(Literal[x] for x in args)
-        return Union[lits]  # pyright: reportGeneralTypeIssues=false
+        return Union[lits]  # type: ignore
 
 
 LiteralEnum = _LiteralEnum()

manager/pyproject.toml

@@ -31,9 +31,9 @@ requests-unixsocket = "^0.2.0"
 click = "^7.1.2"
 toml = "^0.10.2"
 debugpy = "^1.2.1"
-apkg = { git = "https://gitlab.nic.cz/packaging/apkg.git", branch = "master" }
 Sphinx = "^4.0.2"
 supervisor = "^4.2.2"
+pylint = "^2.11.1"
 
 [tool.poe.tasks]
 run = { cmd = "scripts/run", help = "Run the manager" }
@@ -124,6 +124,13 @@ ignore-imports = "no"
 [tool.pylint.DESIGN]
 max-parents = "10"
 
+[tool.pyright]
+include = [
+    "knot_resolver_manager"
+]
+exclude = []
+typeCheckingMode = "strict"
+
 [build-system]
 requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"

manager/pyrightconfig.json

-{
-  "include": [
-    "knot_resolver_manager"
-  ],
-  "exclude": [],
-  "typeCheckingMode": "strict"
-}
\ No newline at end of file