final typing/mypy fixes

Author: RonnyPfannschmidt

.pre-commit-config.yaml

@@ -13,12 +13,10 @@ repos:
         args: [--remove]
     -   id: check-yaml
     -   id: debug-statements
-        language_version: python3
--   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+-   repo: https://github.com/pycqa/flake8
+    rev: 4.0.1
     hooks:
     -   id: flake8
-        language_version: python3
         additional_dependencies:
           - flake8-typing-imports==1.9.0
 -   repo: https://github.com/asottile/reorder_python_imports
@@ -36,3 +34,7 @@ repos:
   rev: "0.3.3"
   hooks:
     - id: pyproject-fmt
+-   repo: https://github.com/pre-commit/mirrors-mypy
+    rev: 'v0.960'
+    hooks:
+    -   id: mypy

conftest.py

@@ -1,8 +1,8 @@
-import py
+import pathlib
 
 import apipkg
 
-LOCAL_APIPKG = py.path.local(__file__).dirpath().join("src/apipkg/__init__.py")
+LOCAL_APIPKG = pathlib.Path(__file__).parent.joinpath("src/apipkg/__init__.py")
 INSTALL_TYPE = "editable" if apipkg.__file__ == LOCAL_APIPKG else "full"
 
 

src/apipkg/__init__.py

@@ -7,15 +7,15 @@
 """
 from __future__ import annotations
 
-__all__ = ["initpkg", "ApiModule", "AliasModule"]
+__all__ = ["initpkg", "ApiModule", "AliasModule", "__version__", "distribution_version"]
 import sys
 from typing import Any
 
 from ._alias_module import AliasModule
-from ._importing import distribution_version as distribution_version  # NOQA:F401
+from ._importing import distribution_version as distribution_version
 from ._module import _initpkg
 from ._module import ApiModule
-from ._version import version as __version__  # NOQA:F401
+from ._version import version as __version__
 
 
 def initpkg(

test_apipkg.py

@@ -70,23 +70,23 @@ def setup_method(self, *args):
             sys.modules.pop(modname, None)
 
     def test_realmodule(self):
-        import realtest.x
+        import realtest.x  # type: ignore
 
         assert "realtest.x.module" in sys.modules
         assert getattr(realtest.x.module, "mytest0")
 
     def test_realmodule_repr(self):
-        import realtest.x
+        import realtest.x  # type: ignore
 
         assert "<ApiModule 'realtest.x'>" == repr(realtest.x)
 
     def test_realmodule_from(self):
-        from realtest.x import module
+        from realtest.x import module  # type: ignore
 
         assert getattr(module, "mytest1")
 
     def test_realmodule__all__(self):
-        import realtest.x.module
+        import realtest.x.module  # type: ignore
 
         assert realtest.x.__all__ == ["module"]
         assert len(realtest.x.module.__all__) == 4
@@ -770,8 +770,8 @@ def doit():
     )
 
     monkeypatch.syspath_prepend(tmpdir)
-    import aliasmodule_proxy as orig
-    from my_aliasmodule_proxy import proxy
+    import aliasmodule_proxy as orig  # type: ignore
+    from my_aliasmodule_proxy import proxy  # type: ignore
 
     doit = proxy.doit
     assert doit is orig.doit
@@ -811,20 +811,20 @@ def test_aliasmodule_nested_import_with_from(tmpdir, monkeypatch):
         )
     )
     monkeypatch.syspath_prepend(tmpdir)
-    from api1 import os2
-    from api1.os2.path import abspath
+    from api1 import os2  # type: ignore
+    from api1.os2.path import abspath  # type: ignore
 
     assert abspath == os.path.abspath
     # check that api1.os2 mirrors os.*
     assert os2.x == 3
-    import api1
+    import api1  # type: ignore
 
     assert "os2.path" not in api1.__dict__
 
 
 def test_initpkg_without_old_module():
     apipkg.initpkg("initpkg_without_old_module", dict(modules="sys:modules"))
-    from initpkg_without_old_module import modules
+    from initpkg_without_old_module import modules  # type: ignore
 
     assert modules is sys.modules