diff --git a/.travis.yml b/.travis.yml index 419400d..64bef9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ jobs: - name: Lint plugin code with isort python: 3.7 - script: 'isort --check' + script: 'isort --check --diff' before_install: | sudo apt update diff --git a/dev-requirements.txt b/dev-requirements.txt index 8d1f5a1..afb5537 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,5 +2,5 @@ black pytest-mypy-plugins==1.0.3 psycopg2 flake8 -isort==4.3.4 +isort==4.3.21 -e . diff --git a/mypy_django_plugin/django/context.py b/mypy_django_plugin/django/context.py index b21ff7f..3170696 100644 --- a/mypy_django_plugin/django/context.py +++ b/mypy_django_plugin/django/context.py @@ -1,18 +1,22 @@ import os from collections import defaultdict from contextlib import contextmanager -from typing import Dict, Iterator, Optional, Set, TYPE_CHECKING, Tuple, Type, Union +from typing import ( + TYPE_CHECKING, Dict, Iterator, Optional, Set, Tuple, Type, Union, +) from django.core.exceptions import FieldError from django.db.models.base import Model +from django.db.models.fields import AutoField, CharField, Field from django.db.models.fields.related import ForeignKey, RelatedField from django.db.models.fields.reverse_related import ForeignObjectRel from django.db.models.sql.query import Query from django.utils.functional import cached_property from mypy.checker import TypeChecker -from mypy.types import AnyType, Instance, Type as MypyType, TypeOfAny +from mypy.types import AnyType, Instance +from mypy.types import Type as MypyType +from mypy.types import TypeOfAny -from django.db.models.fields import AutoField, CharField, Field from mypy_django_plugin.lib import helpers try: diff --git a/mypy_django_plugin/lib/helpers.py b/mypy_django_plugin/lib/helpers.py index e2e6a50..f1b6ad9 100644 --- a/mypy_django_plugin/lib/helpers.py +++ b/mypy_django_plugin/lib/helpers.py @@ -1,15 +1,19 @@ from collections import OrderedDict -from typing import Any, Dict, List, Optional, Set, TYPE_CHECKING, Union, cast +from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Union, cast from mypy import checker from mypy.checker import TypeChecker from mypy.mro import calculate_mro -from mypy.nodes import (Block, ClassDef, Expression, GDEF, MDEF, MemberExpr, MypyFile, NameExpr, StrExpr, SymbolNode, - SymbolTable, SymbolTableNode, TypeInfo, Var) +from mypy.nodes import ( + GDEF, MDEF, Block, ClassDef, Expression, MemberExpr, MypyFile, NameExpr, StrExpr, SymbolNode, SymbolTable, + SymbolTableNode, TypeInfo, Var, +) from mypy.plugin import ( AttributeContext, CheckerPluginInterface, FunctionContext, MethodContext, ) -from mypy.types import AnyType, Instance, NoneTyp, TupleType, Type as MypyType, TypeOfAny, TypedDictType, UnionType +from mypy.types import AnyType, Instance, NoneTyp, TupleType +from mypy.types import Type as MypyType +from mypy.types import TypedDictType, TypeOfAny, UnionType from mypy_django_plugin.lib import fullnames diff --git a/mypy_django_plugin/transformers/querysets.py b/mypy_django_plugin/transformers/querysets.py index b598fa3..190e822 100644 --- a/mypy_django_plugin/transformers/querysets.py +++ b/mypy_django_plugin/transformers/querysets.py @@ -6,7 +6,9 @@ from django.db.models.base import Model from django.db.models.fields.related import RelatedField from mypy.nodes import Expression, NameExpr from mypy.plugin import FunctionContext, MethodContext -from mypy.types import AnyType, Instance, Type as MypyType, TypeOfAny +from mypy.types import AnyType, Instance +from mypy.types import Type as MypyType +from mypy.types import TypeOfAny from mypy_django_plugin.django.context import DjangoContext from mypy_django_plugin.lib import fullnames, helpers diff --git a/setup.cfg b/setup.cfg index 131aaa5..0eb7616 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,7 @@ skip = include_trailing_comma = true multi_line_output = 5 wrap_length = 120 +known_first_party = mypy_django_plugin [flake8] exclude =