Enforce sorting of imports

Author: agronholm

.github/workflows/codeqa-test.yml

@@ -19,9 +19,11 @@ jobs:
         path: ~/.cache/pip
         key: pip-lint
     - name: Install dependencies
-      run: pip install flake8
+      run: pip install flake8 isort
     - name: Run flake8
       run: flake8 sphinx_autodoc_typehints.py tests
+    - name: Run isort
+      run: isort -c sphinx_autodoc_typehints.py tests
 
   test:
     needs: [lint]

pyproject.toml

@@ -5,3 +5,11 @@ requires = [
     "wheel >= 0.29.0",
 ]
 build-backend = 'setuptools.build_meta'
+
+[tool.isort]
+skip_gitignore = true
+line_length = 99
+multi_line_output = 4
+
+[tool.autopep8]
+max_line_length = 99

setup.cfg

@@ -40,7 +40,3 @@ type_comments =
 
 [flake8]
 max-line-length = 99
-
-[tool:pytest]
-addopts = -rsx --tb=short
-testpaths = tests

sphinx_autodoc_typehints.py

@@ -2,7 +2,7 @@
 import sys
 import textwrap
 import typing
-from typing import get_type_hints, TypeVar, Any, AnyStr, Tuple
+from typing import Any, AnyStr, Tuple, TypeVar, get_type_hints
 
 from sphinx.util import logging
 from sphinx.util.inspect import signature as Signature
@@ -425,7 +425,7 @@ def process_docstring(app, what, name, obj, options, lines):
             formatted_annotation = format_annotation(
                 type_hints['return'], fully_qualified=app.config.typehints_fully_qualified,
                 simplify_optional_unions=app.config.simplify_optional_unions
-                )
+            )
 
             insert_index = len(lines)
             for i, line in enumerate(lines):

tests/conftest.py

@@ -1,8 +1,8 @@
 import os
-import re
-import sys
 import pathlib
+import re
 import shutil
+import sys
 
 import pytest
 from sphinx.testing.path import path

tests/roots/test-dummy/conf.py

@@ -1,7 +1,6 @@
 import pathlib
 import sys
 
-
 # Make dummy_module.py available for autodoc.
 sys.path.insert(0, str(pathlib.Path(__file__).parent))
 
@@ -12,4 +11,4 @@
     'sphinx.ext.autodoc',
     'sphinx.ext.napoleon',
     'sphinx_autodoc_typehints',
-    ]
+]

tests/test_sphinx_autodoc_typehints.py

@@ -4,15 +4,15 @@
 import textwrap
 import typing
 from typing import (
-    Any, AnyStr, Callable, Dict, Generic, Mapping, NewType, Optional, Pattern, Match, Tuple,
-    TypeVar, Union, Type)
+    Any, AnyStr, Callable, Dict, Generic, Mapping, Match, NewType, Optional, Pattern, Tuple, Type,
+    TypeVar, Union)
 
 import pytest
 import typing_extensions
 
 from sphinx_autodoc_typehints import (
-    format_annotation, process_docstring, get_annotation_module, get_annotation_class_name,
-    get_annotation_args)
+    format_annotation, get_annotation_args, get_annotation_class_name, get_annotation_module,
+    process_docstring)
 
 try:
     from typing import IO