Update tool configurations (#162)

* Move isort and pytest config
* Update isort config
* Move and update mypy config

Author: cdce8p

pyproject.toml

@@ -2,5 +2,55 @@
 requires = ["setuptools~=60.5", "wheel~=0.37.1"]
 build-backend = "setuptools.build_meta"
 
+[tool.isort]
+# https://pycqa.github.io/isort/docs/configuration/options.html
+multi_line_output = 4
+line_length = 72
+combine_as_imports = true
+force_sort_within_sections = true
+known_first_party = [
+    "python_typing_update",
+    "tests",
+]
+forced_separate = ["tests"]
+
 [tool.pytest.ini_options]
+testpaths = ["tests"]
+norecursedirs = ["fixtures"]
+console_output_style = "count"
+log_level = "NOTSET"
 asyncio_mode = "auto"  # https://github.com/pytest-dev/pytest-asyncio#modes
+
+[tool.mypy]
+# https://mypy.readthedocs.io/en/stable/config_file.html
+python_version = 3.8
+show_error_codes = true
+ignore_missing_imports = true
+strict = true
+follow_imports = "normal"
+exclude = "tests/fixtures/.+\\.py"
+# Untyped definitions and calls
+disallow_untyped_calls = true
+disallow_untyped_defs = true
+disallow_incomplete_defs = true
+check_untyped_defs = true
+# None and optional handeling
+no_implicit_optional = true
+strict_optional = true
+# Configure warnings
+warn_redundant_casts = true
+warn_unused_ignores = true
+warn_unused_configs = true
+# Misc
+implicit_reexport = false
+strict_equality = true
+enable_error_code = ["ignore-without-code"]
+# TODO
+allow_any_generics = true
+
+# [[tool.mypy.overrides]]
+# module = "tests.*"
+# # Untyped definitions and calls
+# disallow_untyped_calls = false
+# disallow_untyped_defs = false
+# disallow_incomplete_defs = false

python_typing_update/main.py

@@ -6,17 +6,17 @@
 import argparse
 import asyncio
 import builtins
-import io
-import logging
 from collections.abc import Iterable
 from functools import partial
+import io
 from io import StringIO
+import logging
 
 import aiofiles
-import reorder_python_imports
 from autoflake import _main as autoflake_main
 from isort.main import main as isort_main
 from pyupgrade._main import main as pyupgrade_main
+import reorder_python_imports
 
 from .const import FileAttributes, FileStatus
 from .utils import (

python_typing_update/utils.py

@@ -4,11 +4,11 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Iterable
 import os
+from pathlib import Path
 import token
 import tokenize
-from collections.abc import Iterable
-from pathlib import Path
 from typing import TextIO
 
 from .const import FileStatus

setup.cfg

@@ -52,49 +52,3 @@ extend_exclude =
     .vscode,
     tests/fixtures,
     venv*,
-
-[tool:pytest]
-testpaths = tests
-norecursedirs = fixtures
-console_output_style = count
-log_level = NOTSET
-
-[tool:isort]
-# https://github.com/PyCQA/isort/wiki/isort-Settings
-multi_line_output = 4
-line_length = 72
-known_first_party =
-    python_typing_update, tests
-forced_separate =
-    tests
-combine_as_imports = true
-
-[mypy]
-# https://mypy.readthedocs.io/en/stable/config_file.html
-python_version = 3.8
-ignore_missing_imports = true
-follow_imports = normal
-exclude = tests/fixtures/.+\.py
-# Untyped definitions and calls
-disallow_untyped_calls = true
-disallow_untyped_defs = true
-disallow_incomplete_defs = true
-check_untyped_defs = true
-# None and optional handeling
-no_implicit_optional = true
-strict_optional = true
-# Configure warnings
-warn_redundant_casts = true
-warn_unused_ignores = true
-warn_unused_configs = true
-# Misc
-implicit_reexport = false
-strict_equality = true
-# TODO
-allow_any_generics = true
-
-[mypy-tests.*]
-# Untyped definitions and calls
-disallow_untyped_calls = false
-disallow_untyped_defs = false
-disallow_incomplete_defs = false

tests/test_main.py

@@ -3,9 +3,9 @@
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
 
+from _pytest.capture import CaptureFixture
 import aiofiles
 import pytest
-from _pytest.capture import CaptureFixture
 
 from python_typing_update.__main__ import async_main
 from python_typing_update.utils import async_restore_files