Consolidate package config to pyproject.toml

.github/workflows/build.yml

@@ -25,12 +25,6 @@ jobs:
         container:
           - image: python:latest
             toxenv: lint
-          - image: python:3.6
-            toxenv: py36-sqla12
-          - image: python:3.6
-            toxenv: py36-sqla13
-          - image: python:3.6
-            toxenv: py36-sqla14
           - image: python:3.7
             toxenv: py37-sqla12
           - image: python:3.7

.pre-commit-config.yaml

@@ -1,34 +1,34 @@
 ---
 repos:
 
-- repo: https://github.com/miki725/importanize
-  rev: '0.7'
-  hooks:
-  - id: importanize
-    language_version: python3
-
 - repo: https://github.com/psf/black
   rev: 22.6.0
   hooks:
   - id: black
     language_version: python3
 
+
+- repo: https://github.com/pycqa/isort
+  rev: 5.10.1
+  hooks:
+  - id: isort
+    name: isort (python)
+
 - repo: https://github.com/asottile/pyupgrade
   rev: v2.37.3
   hooks:
   - id: pyupgrade
     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
+- repo: https://github.com/flakeheaven/flakeheaven
+  rev: 3.0.0
   hooks:
-  - id: flake8
-    exclude: deployment/roles
+  - id: flakeheaven
     additional_dependencies:
       - flake8-bugbear
       - flake8-comprehensions

Dockerfile

@@ -18,13 +18,11 @@ USER sorcerer
 ENV PATH=/opt/pyenv/bin:/home/sorcerer/.pyenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 WORKDIR /code
 
-RUN pyenv install 3.6:latest
 RUN pyenv install 3.7:latest
 RUN pyenv install 3.8:latest
 RUN pyenv install 3.9:latest
 RUN pyenv install 3.10:latest
 
-RUN pyenv install pypy3.6:latest
 RUN pyenv install pypy3.7:latest
 RUN pyenv install pypy3.8:latest
 

MANIFEST.in

@@ -7,7 +7,6 @@ include *.txt
 include *.yaml *.yml
 include LICENSE
 include Makefile
-include pytest.ini
 include tox.ini
 include Dockerfile
 exclude .*

Makefile

@@ -80,7 +80,7 @@ next:  # print next version
 	@echo $(NEXT)
 
 bump: history
-	@sed -i 's/$(VERSION)/$(NEXT)/g' $(PACKAGE)/__version__.py
+	@sed -i 's/$(VERSION)/$(NEXT)/g' $(PACKAGE)/__init__.py
 	@sed -i 's/Next version (unreleased yet)/$(NEXT) ($(shell date +"%Y-%m-%d"))/g' HISTORY.rst
 	@git add .
 	@git commit -am "Bump version: $(VERSION) → $(NEXT)"

django_sorcery/__init__.py

@@ -1,14 +1,3 @@
-from .__version__ import (
-    __author__,
-    __author_email__,
-    __description__,
-    __version__,
-)
+__version__ = "0.12.0"
 
-
-__all__ = [
-    "__author__",
-    "__author_email__",
-    "__description__",
-    "__version__",
-]
+VERSION = tuple(__version__.split("."))

django_sorcery/db/__init__.py

@@ -141,5 +141,4 @@
 from .sqlalchemy import SQLAlchemy  # noqa
 from .utils import dbdict
 
-
 databases = dbdict()

django_sorcery/db/fields.py

@@ -10,7 +10,6 @@
 
 from .url import DIALECT_MAP_TO_DJANGO
 
-
 __all__ = [
     "BigIntegerField",
     "BinaryField",

django_sorcery/db/meta/column.py

@@ -4,8 +4,8 @@
 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/model.py

@@ -1,12 +1,14 @@
 """Metadata for sqlalchemy models."""
-from collections import OrderedDict, namedtuple
+from collections import OrderedDict
+from collections import namedtuple
 from functools import partial
 from itertools import chain
 
 import inflect
 import sqlalchemy as sa
 from django.apps import apps
-from django.core.exceptions import FieldDoesNotExist, ValidationError
+from django.core.exceptions import FieldDoesNotExist
+from django.core.exceptions import ValidationError
 
 from ...exceptions import NestedValidationError
 from ...validators import ValidationRunner
@@ -15,7 +17,6 @@
 from .composite import composite_info
 from .relations import relation_info
 
-
 Identity = namedtuple("Key", ["model", "pk"])
 inflector = inflect.engine()
 

django_sorcery/db/meta/relations.py

@@ -95,7 +95,8 @@ def formfield(self, form_class=None, **kwargs):
             return form_class(self.related_model, **field_kwargs)
 
     def get_form_class(self):
-        from ...fields import ModelChoiceField, ModelMultipleChoiceField
+        from ...fields import ModelChoiceField
+        from ...fields import ModelMultipleChoiceField
 
         if self.uselist:
             return ModelMultipleChoiceField

django_sorcery/db/middleware.py

@@ -4,7 +4,6 @@
 from . import databases
 from .signals import all_signals
 
-
 before_middleware_request = all_signals.signal("before_middleware_request")
 after_middleware_response = all_signals.signal("after_middleware_response")
 

django_sorcery/db/models.py

@@ -4,11 +4,13 @@
 import sqlalchemy as sa
 import sqlalchemy.ext.declarative  # noqa
 import sqlalchemy.orm  # noqa
+from sqlalchemy.orm.base import MANYTOONE
+from sqlalchemy.orm.base import 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 . import meta
+from . import signals
 from .mixins import CleanMixin
 
 

django_sorcery/db/profiler.py

@@ -1,14 +1,14 @@
 """sqlalchemy profiling things."""
 import logging
 import time
-from collections import defaultdict, namedtuple
+from collections import defaultdict
+from collections import namedtuple
 from functools import partial
 from threading import local
 
 import sqlalchemy as sa
 from django.conf import settings
 
-
 logger = logging.getLogger(__name__)
 STATEMENT_TYPES = {"SELECT": "select", "INSERT INTO": "insert", "UPDATE": "update", "DELETE": "delete"}
 

django_sorcery/db/query.py

@@ -9,7 +9,6 @@
 from ..utils import lower
 from . import meta
 
-
 Operation = namedtuple("Operation", ["name", "args", "kwargs"])
 
 # todo add transforms support - e.g. column__date__gt

django_sorcery/db/session.py

@@ -1,7 +1,8 @@
 """sqlalchemy session related things."""
 from itertools import chain
 
-from sqlalchemy import event, orm
+from sqlalchemy import event
+from sqlalchemy import orm
 
 from ..utils import setdefaultattr
 from . import signals

django_sorcery/db/sqlalchemy.py

@@ -8,10 +8,14 @@
 from sqlalchemy.ext.declarative import declarative_base
 
 from ..utils import make_args
-from . import fields, signals
-from .composites import BaseComposite, CompositeField
-from .models import Base, BaseMeta
-from .query import Query, QueryProperty
+from . import fields
+from . import signals
+from .composites import BaseComposite
+from .composites import CompositeField
+from .models import Base
+from .models import BaseMeta
+from .query import Query
+from .query import QueryProperty
 from .relations import RelationsMixin
 from .session import SignallingSession
 from .transaction import TransactionContext

django_sorcery/db/url.py

@@ -7,7 +7,6 @@
 from django.utils.encoding import force_str
 from django.utils.module_loading import import_string
 
-
 DIALECT_MAP = {
     "django.db.backends.sqlite3": "sqlite",
     "django.db.backends.postgresql": "postgresql",

django_sorcery/db/utils.py

@@ -6,7 +6,8 @@
 
 from .sqlalchemy import SQLAlchemy
 from .transaction import TransactionContext
-from .url import get_settings, make_url
+from .url import get_settings
+from .url import make_url
 
 
 class dbdict(dict):

django_sorcery/forms.py

@@ -3,20 +3,14 @@
 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
+from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import 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
+from django.forms.forms import DeclarativeFieldsMetaclass
+from django.forms.models import BaseModelForm as DjangoBaseModelForm
+from django.forms.models import ModelFormOptions
 from django.forms.utils import ErrorList
 
 from .db import meta

django_sorcery/formsets/base.py

@@ -2,11 +2,13 @@
 
 from django.core.exceptions import ImproperlyConfigured
 from django.forms import fields as djangofields
-from django.forms.formsets import BaseFormSet, formset_factory
+from django.forms.formsets import BaseFormSet
+from django.forms.formsets import formset_factory
 from django.forms.widgets import HiddenInput
 
 from ..db import meta
-from ..forms import ModelForm, modelform_factory
+from ..forms import ModelForm
+from ..forms import modelform_factory
 
 
 class BaseModelFormSet(BaseFormSet):

django_sorcery/formsets/inline.py

@@ -2,7 +2,8 @@
 
 from ..db import meta
 from ..forms import ModelForm
-from .base import BaseModelFormSet, modelformset_factory
+from .base import BaseModelFormSet
+from .base import modelformset_factory
 
 
 class BaseInlineFormSet(BaseModelFormSet):

django_sorcery/management/alembic.py

@@ -1,16 +1,21 @@
 """Alembic Django command things."""
 import os
-from collections import OrderedDict, namedtuple
+from collections import OrderedDict
+from collections import namedtuple
 
 import alembic
 import alembic.config
-from django.core.management.base import BaseCommand, CommandError
-from django.utils.functional import cached_property
 from sqlalchemy.orm import configure_mappers
+from django.core.management.base import BaseCommand
+from django.core.management.base import CommandError
+from django.utils.functional import cached_property
 
-from ..db import alembic as sorcery_alembic, databases, meta, signals
-from ..db.alembic import include_object, process_revision_directives
-
+from ..db import alembic as sorcery_alembic
+from ..db import databases
+from ..db import meta
+from ..db import signals
+from ..db.alembic import include_object
+from ..db.alembic import process_revision_directives
 
 SORCERY_ALEMBIC_CONFIG_FOLDER = os.path.abspath(os.path.dirname(sorcery_alembic.__file__))
 

django_sorcery/management/base.py

@@ -3,7 +3,8 @@
 import os
 
 import sqlalchemy as sa
-from django.core.management.base import BaseCommand, CommandParser
+from django.core.management.base import BaseCommand
+from django.core.management.base import CommandParser
 
 
 class NamespacedCommand(BaseCommand):

django_sorcery/management/commands/sorcery_createall.py

@@ -1,7 +1,7 @@
 """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_dropall.py

@@ -1,7 +1,7 @@
 """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/routers.py

@@ -6,7 +6,6 @@
 
 from .db import meta
 
-
 try:
     from django.conf.urls import url as re_path
 except ImportError:  # pragma: no cover

django_sorcery/shortcuts.py

@@ -1,13 +1,12 @@
 """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: