Consolidate package config to pyproject.toml

Author: shosca

.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/__version__.py

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

django_sorcery/db/__init__.py

@@ -10,7 +10,6 @@
 
 from .url import DIALECT_MAP_TO_DJANGO
 
-
 __all__ = [
     "BigIntegerField",
     "BinaryField",
@@ -46,11 +45,8 @@ class Field(sa.Column):
     def __init__(self, *args, **kwargs):
         self.db = kwargs.pop("db", None)
 
-        name = None
         args = list(args)
-        if args and isinstance(args[0], str):
-            name = args.pop(0)
-
+        name = args.pop(0) if args and isinstance(args[0], str) else None
         column_type = kwargs.pop("type_", None)
         if args and hasattr(args[0], "_sqla_type"):
             column_type = args.pop(0)
@@ -267,7 +263,7 @@ def get_django_dialect_ranges(self):
         ops = operations.BaseDatabaseOperations
         with suppress(ImportError):
             ops = (
-                import_string(DIALECT_MAP_TO_DJANGO.get(self.db.url.get_dialect().name) + ".base.DatabaseOperations")
+                import_string(f"{DIALECT_MAP_TO_DJANGO.get(self.db.url.get_dialect().name)}.base.DatabaseOperations")
                 if self.db
                 else operations.BaseDatabaseOperations
             )

django_sorcery/db/fields.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
@@ -166,7 +166,7 @@ def clean(self, value, instance):
 
     def validate(self, value, instance):
         """Validate value and raise ValidationError if necessary."""
-        getattr(instance, "clean_" + self.name, bool)()
+        getattr(instance, f"clean_{self.name}", bool)()
 
     def run_validators(self, value):
         """Run field's validators and raise ValidationError if necessary."""
@@ -194,9 +194,7 @@ def __init__(self, column, prop=None, parent=None, name=None):
         self.field_kwargs["max_length"] = self.column.type.length
 
     def to_python(self, value):
-        if value is None:
-            return value
-        return str(value).strip()
+        return value if value is None else str(value).strip()
 
 
 class text_column_info(string_column_info):
@@ -324,9 +322,7 @@ def to_python(self, value):
             return bool(value)
         if value in ("t", "T"):
             return True
-        if value in ("f", "F"):
-            return False
-        return self.coercer.to_python(value)
+        return False if value in ("f", "F") else self.coercer.to_python(value)
 
 
 class date_column_info(column_info):