[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 repos:
 
 - repo: https://github.com/miki725/importanize
-  rev: '0.7'
+  rev: '0.8.0-alpha1'
   hooks:
   - id: importanize
     language_version: python3
@@ -20,12 +20,12 @@ repos:
     args: [--py3-plus]
 
 - repo: https://github.com/myint/docformatter
-  rev: v1.4
+  rev: v1.5.0-rc1
   hooks:
   - id: docformatter
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 5.0.2
+  rev: 5.0.4
   hooks:
   - id: flake8
     exclude: deployment/roles

django_sorcery/__init__.py

@@ -1,9 +1,4 @@
-from .__version__ import (
-    __author__,
-    __author_email__,
-    __description__,
-    __version__,
-)
+from .__version__ import __author__, __author_email__, __description__, __version__
 
 
 __all__ = [

django_sorcery/db/fields.py

@@ -2,6 +2,7 @@
 from contextlib import suppress
 
 import sqlalchemy as sa
+
 from django import forms as djangoforms
 from django.core import validators as django_validators
 from django.db.backends.base import operations

django_sorcery/db/meta/column.py

@@ -4,8 +4,10 @@
 import enum
 from contextlib import suppress
 
-import sqlalchemy as sa
 from dateutil.parser import parse
+
+import sqlalchemy as sa
+
 from django import forms as djangoforms
 from django.conf import settings
 from django.core import validators as djangovalidators

django_sorcery/db/meta/composite.py

@@ -2,6 +2,7 @@
 from collections import OrderedDict
 
 import sqlalchemy as sa
+
 from django.core.exceptions import ValidationError
 
 from ...exceptions import NestedValidationError

django_sorcery/db/meta/model.py

@@ -4,7 +4,9 @@
 from itertools import chain
 
 import inflect
+
 import sqlalchemy as sa
+
 from django.apps import apps
 from django.core.exceptions import FieldDoesNotExist, ValidationError
 

django_sorcery/db/meta/relations.py

@@ -2,6 +2,7 @@
 from itertools import chain
 
 import sqlalchemy as sa
+
 from django.core.exceptions import ImproperlyConfigured
 
 

django_sorcery/db/models.py

@@ -4,9 +4,10 @@
 import sqlalchemy as sa
 import sqlalchemy.ext.declarative  # noqa
 import sqlalchemy.orm  # noqa
+from sqlalchemy.orm.base import MANYTOONE, NO_VALUE
+
 from django.core.exceptions import ValidationError
 from django.utils.text import camel_case_to_spaces
-from sqlalchemy.orm.base import MANYTOONE, NO_VALUE
 
 from . import meta, signals
 from .mixins import CleanMixin

django_sorcery/db/profiler.py

@@ -6,6 +6,7 @@
 from threading import local
 
 import sqlalchemy as sa
+
 from django.conf import settings
 
 

django_sorcery/db/query.py

@@ -4,6 +4,7 @@
 
 import sqlalchemy as sa
 import sqlalchemy.orm  # noqa
+
 from django.db.models.constants import LOOKUP_SEP
 
 from ..utils import lower

django_sorcery/db/url.py

@@ -3,6 +3,7 @@
 from importlib import import_module
 
 import sqlalchemy as sa
+
 from django.conf import settings
 from django.utils.encoding import force_str
 from django.utils.module_loading import import_string

django_sorcery/db/utils.py

@@ -1,6 +1,7 @@
 from contextlib import suppress
 
 import sqlalchemy as sa
+
 from django.db import DEFAULT_DB_ALIAS
 from django.utils.module_loading import import_string
 

django_sorcery/forms.py

@@ -3,20 +3,10 @@
 from contextlib import suppress
 from itertools import chain
 
-from django.core.exceptions import (
-    NON_FIELD_ERRORS,
-    ImproperlyConfigured,
-    ValidationError,
-)
+from django.core.exceptions import NON_FIELD_ERRORS, ImproperlyConfigured, ValidationError
 from django.forms import ALL_FIELDS
-from django.forms.forms import (
-    BaseForm as DjangoBaseForm,
-    DeclarativeFieldsMetaclass,
-)
-from django.forms.models import (
-    BaseModelForm as DjangoBaseModelForm,
-    ModelFormOptions,
-)
+from django.forms.forms import BaseForm as DjangoBaseForm, DeclarativeFieldsMetaclass
+from django.forms.models import BaseModelForm as DjangoBaseModelForm, ModelFormOptions
 from django.forms.utils import ErrorList
 
 from .db import meta

django_sorcery/management/alembic.py

@@ -4,9 +4,11 @@
 
 import alembic
 import alembic.config
+
+from sqlalchemy.orm import configure_mappers
+
 from django.core.management.base import BaseCommand, CommandError
 from django.utils.functional import cached_property
-from sqlalchemy.orm import configure_mappers
 
 from ..db import alembic as sorcery_alembic, databases, meta, signals
 from ..db.alembic import include_object, process_revision_directives

django_sorcery/management/base.py

@@ -3,6 +3,7 @@
 import os
 
 import sqlalchemy as sa
+
 from django.core.management.base import BaseCommand, CommandParser
 
 

django_sorcery/management/commands/sorcery_createall.py

@@ -1,8 +1,9 @@
 """CreateAll command."""
 
-from django.core.management.base import BaseCommand
 from sqlalchemy.orm import configure_mappers
 
+from django.core.management.base import BaseCommand
+
 from ...db import databases
 
 

django_sorcery/management/commands/sorcery_downgrade.py

@@ -2,6 +2,7 @@
 from functools import partial
 
 import alembic
+
 from django.core.management import CommandError
 
 from ..alembic import AlembicCommand

django_sorcery/management/commands/sorcery_dropall.py

@@ -1,8 +1,9 @@
 """DropAll command."""
 
-from django.core.management.base import BaseCommand
 from sqlalchemy.orm import configure_mappers
 
+from django.core.management.base import BaseCommand
+
 from ...db import databases
 
 

django_sorcery/management/commands/sorcery_stamp.py

@@ -2,6 +2,7 @@
 from functools import partial
 
 import alembic
+
 from django.core.management import CommandError
 
 from ..alembic import AlembicCommand

django_sorcery/management/commands/sorcery_upgrade.py

@@ -2,6 +2,7 @@
 from functools import partial
 
 import alembic
+
 from django.core.management import CommandError
 
 from ..alembic import AlembicCommand

django_sorcery/shortcuts.py

@@ -1,13 +1,13 @@
 """Some Django like shortcuts that support sqlalchemy models."""
 from contextlib import suppress
 
+from sqlalchemy.exc import InvalidRequestError
+
 from django.core.exceptions import ImproperlyConfigured
 from django.http import Http404
-from sqlalchemy.exc import InvalidRequestError
 
 
 def _get_query(klass):
-
     query = getattr(klass, "query", None) or getattr(klass, "objects", None)
 
     if query:

django_sorcery/validators/base.py

@@ -1,9 +1,10 @@
 """Validators."""
 
 import sqlalchemy as sa
+from sqlalchemy import inspect
+
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
-from sqlalchemy import inspect
 
 
 class ValidateTogetherModelFields:

django_sorcery/views/base.py

@@ -1,14 +1,15 @@
 """Base model view things with sqlalchemy."""
 from contextlib import suppress
 
+from sqlalchemy import literal
+from sqlalchemy.exc import InvalidRequestError
+
 from django.apps import apps
 from django.core.exceptions import ImproperlyConfigured
 from django.core.paginator import InvalidPage, Paginator
 from django.http import Http404
 from django.utils.translation import gettext
 from django.views.generic.base import ContextMixin
-from sqlalchemy import literal
-from sqlalchemy.exc import InvalidRequestError
 
 from ..db import meta
 

django_sorcery/views/edit.py

@@ -6,11 +6,7 @@
 from django.views.generic.edit import FormMixin
 
 from .. import forms
-from .detail import (
-    BaseDetailView,
-    SingleObjectMixin,
-    SingleObjectTemplateResponseMixin,
-)
+from .detail import BaseDetailView, SingleObjectMixin, SingleObjectTemplateResponseMixin
 
 
 class ModelFormMixin(FormMixin, SingleObjectMixin):

docs/conf.py

@@ -20,9 +20,10 @@
 import os
 import sys
 
+import sphinx_rtd_theme
+
 import django
 import django.test.utils
-import sphinx_rtd_theme
 from django.conf import settings
 
 

test_site/polls/apps.py

@@ -1,6 +1,7 @@
-from django.apps import AppConfig
 from sqlalchemy.orm import configure_mappers
 
+from django.apps import AppConfig
+
 
 class PollsConfig(AppConfig):
     name = "polls"

test_site/polls/urls.py

@@ -1,4 +1,5 @@
 from django.urls import include, path
+
 from django_sorcery.routers import SimpleRouter
 
 from . import views

test_site/polls/views.py

@@ -1,5 +1,6 @@
 from django.http import HttpResponseRedirect
 from django.urls import reverse, reverse_lazy
+
 from django_sorcery.formsets import inlineformset_factory
 from django_sorcery.routers import action
 from django_sorcery.viewsets import ModelViewSet

tests/__init__.py

@@ -1,8 +1,9 @@
 import os
 
-import django
 from psycopg2cffi import compat
 
+import django
+
 
 compat.register()
 

tests/base.py

@@ -1,5 +1,7 @@
 from bs4 import BeautifulSoup
+
 from django import test
+
 from django_sorcery.db import databases
 
 

tests/db/alembic/test_base.py

@@ -1,5 +1,7 @@
 import alembic.config
+
 from django.test import TestCase
+
 from django_sorcery.db.alembic.base import setup_config
 
 

tests/db/alembic/test_signals.py

@@ -1,9 +1,7 @@
 from django.test import TestCase
+
 from django_sorcery.db import signals
-from django_sorcery.db.alembic.signals import (
-    include_object,
-    process_revision_directives,
-)
+from django_sorcery.db.alembic.signals import include_object, process_revision_directives
 
 
 class TestIncludeObject(TestCase):

tests/db/meta/test_column.py

@@ -3,22 +3,19 @@
 from decimal import Decimal
 
 import pytz
+
 import sqlalchemy as sa
+
 from django import forms as djangoforms
 from django.core import validators as django_validators
 from django.core.exceptions import ValidationError
 from django.forms import fields as djangofields, widgets
+
 from django_sorcery import fields as sorceryfields
 from django_sorcery.db import fields as dbfields, meta
 
 from ...base import TestCase, mock
-from ...testapp.models import (
-    COLORS,
-    AllKindsOfFields,
-    Business,
-    Vehicle,
-    VehicleType,
-)
+from ...testapp.models import COLORS, AllKindsOfFields, Business, Vehicle, VehicleType
 
 
 class TestColumnMeta(TestCase):

tests/db/meta/test_composite.py

@@ -1,4 +1,5 @@
 from django.core.exceptions import ValidationError
+
 from django_sorcery.db import meta  # noqa
 
 from ...base import TestCase

tests/db/meta/test_model.py

@@ -1,6 +1,8 @@
 import sqlalchemy as sa
+
 from django.apps import apps
 from django.core.exceptions import FieldDoesNotExist
+
 from django_sorcery.db import meta  # noqa
 
 from ...base import TestCase

tests/db/meta/test_relations.py

@@ -1,5 +1,7 @@
 import sqlalchemy as sa
+
 from django.core.exceptions import ImproperlyConfigured
+
 from django_sorcery import fields
 from django_sorcery.db import meta