switch to ruff for linting and formatting fix #62

Author: bckohan

check.sh

@@ -7,7 +7,7 @@ if [ "$1" == "--no-fix" ]; then
     poetry run ruff check
 else
     poetry run ruff format
-    poetry run ruff format --line-length 80 examples
+    #poetry run ruff format --line-length 80 examples
     poetry run ruff check --fix --select I
     poetry run ruff check --fix
 fi

django_enum/choices.py

@@ -14,11 +14,10 @@
 
 from django_enum.utils import choices, names
 
-
 ChoicesType = (
     model_enums.ChoicesType
-    if django_version[0:2] >= (5, 0) else
-    model_enums.ChoicesMeta
+    if django_version[0:2] >= (5, 0)
+    else model_enums.ChoicesMeta
 )
 
 DEFAULT_BOUNDARY = getattr(enum, "KEEP", None)
@@ -115,7 +114,6 @@ def __hash__(self):
             return enum.IntFlag.__hash__(self)
 
 except (ImportError, ModuleNotFoundError):
-
     # 3.11 - extend from Enum so base type check does not throw type error
     class MissingEnumProperties(enum.Enum):
         """Throw error if choice types are used without enum-properties"""

django_enum/converters.py

@@ -14,7 +14,6 @@
 
 
 class _EnumConverter:
-
     enum: Type[Enum]
     prop: str = "value"
     primitive: type

django_enum/fields.py

@@ -2,13 +2,15 @@
 """
 Support for Django model fields built from enumeration types.
 """
+
 import sys
 from datetime import date, datetime, time, timedelta
 from decimal import Decimal, DecimalException
 from enum import Enum, Flag, IntFlag
 from functools import reduce
 from operator import or_
 from typing import Any, Generic, List, Optional, Tuple, Type, TypeVar, Union
+
 from django import VERSION as django_version
 from django.core.exceptions import ValidationError
 from django.core.validators import DecimalValidator
@@ -654,7 +656,6 @@ def validate(self, value: Any, model_instance: Optional[Model]):
             ) from err
 
     def formfield(self, form_class=None, choices_form_class=None, **kwargs):
-
         # super().formfield deletes anything unrecognized from kwargs that
         #   we try to pass in. Very annoying because we have to
         #   un-encapsulate some of this initialization logic, this makes our
@@ -752,15 +753,18 @@ def contribute_to_class(
                 constraint |= Q(**{f"{name}__isnull": True})
             cls._meta.constraints = [  # pylint: disable=W0212
                 *cls._meta.constraints,  # pylint: disable=W0212
-                CheckConstraint(**{
-                    condition: constraint,
-                    "name": self.constraint_name(cls, name, self.enum)
-                }),
+                CheckConstraint(
+                    **{
+                        condition: constraint,
+                        "name": self.constraint_name(cls, name, self.enum),
+                    }
+                ),
             ]  # pylint: disable=protected-access
             # this dictionary is used to serialize the model, so if constraints
             # is not present - they will not be added to migrations
             cls._meta.original_attrs.setdefault(  # pylint: disable=W0212
-                "constraints", cls._meta.constraints  # pylint: disable=W0212
+                "constraints",
+                cls._meta.constraints,  # pylint: disable=W0212
             )
 
 
@@ -1169,7 +1173,6 @@ def contribute_to_class(
             ]
 
             if is_strict or is_conform or (is_eject and self.strict) and flags:
-
                 constraint = (  # pylint: disable=E1131
                     Q(**{f"{name}__gte": min(*flags)})
                     & Q(**{f"{name}__lte": reduce(or_, flags)})
@@ -1180,16 +1183,19 @@ def contribute_to_class(
 
                 cls._meta.constraints = [  # pylint: disable=W0212
                     *cls._meta.constraints,  # pylint: disable=W0212
-                    CheckConstraint(**{
-                        condition: constraint,
-                        "name": self.constraint_name(cls, name, self.enum),
-                    }),
+                    CheckConstraint(
+                        **{
+                            condition: constraint,
+                            "name": self.constraint_name(cls, name, self.enum),
+                        }
+                    ),
                 ]
                 # this dictionary is used to serialize the model, so if
                 # constraints is not present - they will not be added to
                 # migrations
                 cls._meta.original_attrs.setdefault(  # pylint: disable=W0212
-                    "constraints", cls._meta.constraints  # pylint: disable=W0212
+                    "constraints",
+                    cls._meta.constraints,  # pylint: disable=W0212
                 )
         if isinstance(self, FlagField):
             # this may have been called by a normal EnumField to bring in flag-like constraints

django_enum/forms.py

@@ -252,9 +252,7 @@ def default_coerce(self, value: Any) -> Any:  # pylint: disable=E0202
             one of our empty_values, or the value itself if this is a
             non-strict field and the value is of a matching primitive type
         """
-        if self.enum is not None and not isinstance(
-            value, self.enum
-        ):  # pylint: disable=R0801
+        if self.enum is not None and not isinstance(value, self.enum):  # pylint: disable=R0801
             try:
                 value = self.enum(value)
             except (TypeError, ValueError):

doc/source/changelog.rst

@@ -6,16 +6,17 @@ v2.0.0
 ======
 
 * Completed `Reorganize tests <https://github.com/bckohan/django-enum/issues/70>`_
-* Implemented `Add database constraints on enum fields by default. <https://github.com/bckohan/django-enum/issues/45>`_
-* Implemented `Provide an optional enum path converter. <https://github.com/bckohan/django-enum/issues/22>`_
+* Completed `Switch linting and formatting to ruff <https://github.com/bckohan/django-enum/issues/62>`_
 * Implemented `Supply a mixin for DRF ModelSerializers that instantiates the provided DRF EnumField type for model EnumFields. <https://github.com/bckohan/django-enum/issues/47>`_
-* Implemented `Add support for date, datetime, timedelta, time and Decimal enumeration types. <https://github.com/bckohan/django-enum/issues/43>`_
 * Implemented `EnumField's should inherit from common base titled EnumField <https://github.com/bckohan/django-enum/issues/46>`_
-* Implemented `Provide parameter to override integer range on EnumField. <https://github.com/bckohan/django-enum/issues/38>`_
-* Implemented `Add all official supported Django RDBMS backends to CI <https://github.com/bckohan/django-enum/issues/33>`_
+* Implemented `Add database constraints on enum fields by default. <https://github.com/bckohan/django-enum/issues/45>`_
 * Fixed `to_python() raises ValueError instead of spec'ed ValidationError <https://github.com/bckohan/django-enum/issues/44>`_
-* Fixed `When coerce is false, to_python does not convert to the Enum's primitive type <https://github.com/bckohan/django-enum/issues/39>`_
+* Implemented `Add support for date, datetime, timedelta, time and Decimal enumeration types. <https://github.com/bckohan/django-enum/issues/43>`_
 * Fixed `None should be an allowable enumeration value in enums of any primitive type. <https://github.com/bckohan/django-enum/issues/42>`_
+* Fixed `When coerce is false, to_python does not convert to the Enum's primitive type <https://github.com/bckohan/django-enum/issues/39>`_
+* Implemented `Provide parameter to override integer range on EnumField. <https://github.com/bckohan/django-enum/issues/38>`_
+* Implemented `Add all official supported Django RDBMS backends to CI <https://github.com/bckohan/django-enum/issues/33>`_
+* Implemented `Provide an optional enum path converter. <https://github.com/bckohan/django-enum/issues/22>`_
 
 
 v1.3.3

manage.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 import os
+
 from django.core import management
 
 
 def main():
-    os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
+    os.environ["DJANGO_SETTINGS_MODULE"] = "tests.settings"
     management.execute_from_command_line()