Migrate mypy from setuf.cfg -> pyproject.toml. Starting running again…

…st tests in CI

isort/exceptions.py

@@ -1,6 +1,6 @@
 """All isort specific exception classes should be defined here"""
 from pathlib import Path
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Type, Union
 
 from .profiles import profiles
 
@@ -107,7 +107,7 @@ class LiteralParsingFailure(ISortError):
     the given data structure.
     """
 
-    def __init__(self, code: str, original_error: Exception):
+    def __init__(self, code: str, original_error: Union[Exception, Type[Exception]]):
         super().__init__(
             f"isort failed to parse the given literal {code}. It's important to note "
             "that isort literal sorting only supports simple literals parsable by "

isort/format.py

@@ -6,7 +6,7 @@
 from typing import Optional, TextIO
 
 try:
-    import colorama  # type: ignore
+    import colorama
 except ImportError:
     colorama_unavailable = True
 else:

isort/settings.py

@@ -15,6 +15,7 @@
 from functools import lru_cache
 from pathlib import Path
 from typing import (
+    TYPE_CHECKING,
     Any,
     Callable,
     Dict,
@@ -32,7 +33,6 @@
 
 from . import sorting, stdlibs
 from ._future import dataclass, field
-from ._vendored import toml  # type: ignore
 from .exceptions import (
     FormattingPluginDoesNotExist,
     InvalidSettingsPath,
@@ -46,6 +46,11 @@
 from .wrap_modes import WrapModes
 from .wrap_modes import from_string as wrap_mode_from_string
 
+if TYPE_CHECKING:
+    toml: Any
+else:
+    from ._vendored import toml
+
 _SHEBANG_RE = re.compile(br"^#!.*\bpython[23w]?\b")
 CYTHON_EXTENSIONS = frozenset({"pyx", "pxd"})
 SUPPORTED_EXTENSIONS = frozenset({"py", "pyi", *CYTHON_EXTENSIONS})

pyproject.toml

@@ -58,7 +58,7 @@ bandit = "^1.6"
 safety = "^1.8"
 flake8-bugbear = "^19.8"
 black = {version = "^20.08b1", allow-prereleases = true}
-mypy = "^0.901"
+mypy = "^0.902"
 ipython = "^7.7"
 pytest = "^6.0"
 pytest-cov = "^2.7"
@@ -116,3 +116,15 @@ palette = {scheme = "isort"}
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.mypy]
+python_version = 3.6
+strict = true
+follow_imports = "silent"
+exclude = "isort/_vendored|tests/unit/example_projects|tests/unit/example_crlf_file.py"
+
+[[tool.mypy.overrides]]
+module = "tests.*"
+allow_untyped_defs = true
+allow_incomplete_defs = true
+allow_untyped_calls = true

scripts/lint.sh

@@ -2,7 +2,7 @@
 set -euxo pipefail
 
 poetry run cruft check
-poetry run mypy -p isort
+poetry run mypy -p isort -p tests
 poetry run black --target-version py36 --check .
 poetry run isort --profile hug --check --diff isort/ tests/
 poetry run isort --profile hug --check --diff example_*/

setup.cfg

@@ -1,17 +1,3 @@
-[mypy]
-python_version = 3.6
-strict = True
-follow_imports = silent
-
-[mypy-isort.isort._vendored.*]
-ignore_errors = True
-
-[mypy-test_isort]
-strict_optional = False
-
-[mypy-isort.isort]
-strict_optional = False
-
 [tool:pytest]
 testpaths = tests
 

tests/unit/profiles/test_black.py

@@ -9,7 +9,7 @@ def black_format(code: str, is_pyi: bool = False, line_length: int = 88) -> str:
         return black.format_file_contents(
             code,
             fast=True,
-            mode=black.FileMode(
+            mode=black.FileMode(  # type: ignore
                 is_pyi=is_pyi,
                 line_length=line_length,
             ),

tests/unit/test_api.py

@@ -14,7 +14,7 @@
 
 
 @pytest.fixture
-def imperfect(tmpdir) -> None:
+def imperfect(tmpdir):
     imperfect_file = tmpdir.join("test_needs_changes.py")
     imperfect_file.write_text(imperfect_content, "utf8")
     return imperfect_file

tests/unit/test_deprecated_finders.py

@@ -31,13 +31,13 @@ def test_init(self):
         assert FindersManager(settings.DEFAULT_CONFIG)
 
         class ExceptionOnInit(finders.BaseFinder):
-            def __init__(*args, **kwargs):
+            def __init__(self, *args, **kwargs):
                 super().__init__(*args, **kwargs)
                 raise ValueError("test")
 
         with patch(
             "isort.deprecated.finders.FindersManager._default_finders_classes",
-            FindersManager._default_finders_classes + (ExceptionOnInit,),
+            FindersManager._default_finders_classes + (ExceptionOnInit,),  # type: ignore
         ):
             assert FindersManager(settings.Config(verbose=True))
 
@@ -59,14 +59,14 @@ class AbstractTestFinder:
 
     @classmethod
     def setup_class(cls):
-        cls.instance = cls.kind(settings.DEFAULT_CONFIG)
+        cls.instance = cls.kind(settings.DEFAULT_CONFIG)  # type: ignore
 
     def test_create(self):
-        assert self.kind(settings.DEFAULT_CONFIG)
+        assert self.kind(settings.DEFAULT_CONFIG)  # type: ignore
 
     def test_find(self):
-        self.instance.find("isort")
-        self.instance.find("")
+        self.instance.find("isort")  # type: ignore
+        self.instance.find("")  # type: ignore
 
 
 class TestForcedSeparateFinder(AbstractTestFinder):
@@ -154,7 +154,7 @@ def test_requirements_finder(tmpdir) -> None:
         assert finder.find("flask") is None  # package not in reqs
         assert finder.find("deal") == sections.THIRDPARTY  # vcs
 
-        assert len(finder.mapping) > 100
+        assert len(finder.mapping) > 100  # type: ignore
         assert finder._normalize_name("deal") == "deal"
         assert finder._normalize_name("Django") == "django"  # lowercase
         assert finder._normalize_name("django_haystack") == "haystack"  # mapping
@@ -174,7 +174,7 @@ def test_pipfile_finder(tmpdir) -> None:
     assert finder.find("flask") is None  # package not in reqs
     assert finder.find("deal") == sections.THIRDPARTY  # vcs
 
-    assert len(finder.mapping) > 100
+    assert len(finder.mapping) > 100  # type: ignore
     assert finder._normalize_name("deal") == "deal"
     assert finder._normalize_name("Django") == "django"  # lowercase
     assert finder._normalize_name("django_haystack") == "haystack"  # mapping