merge changes from 1.3 upstream adding support for 5.0

Author: bckohan

.github/workflows/test.yml

@@ -12,11 +12,11 @@ jobs:
         python-version: [ '3.7', '3.12' ]
         django-version:
           - 'Django~=3.2.0' # LTS April 2024
-          - 'Django~=4.1.0' # December 2023
           - 'Django~=4.2.0' # LTS April 2026
+          - 'Django~=5.0.0' # April 2025
         exclude:
           - python-version: '3.7'
-            django-version: 'Django~=4.1.0'
+            django-version: 'Django~=5.0.0'
           - python-version: '3.7'
             django-version: 'Django~=4.2.0'
           - python-version: '3.12'
@@ -112,6 +112,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
@@ -163,8 +164,10 @@ jobs:
       run: |
         poetry run pytest
     - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v3
       uses: codecov/codecov-action@v3
       with:
+        token: ${{ secrets.CODECOV_TOKEN }}
         file: ./coverage.xml
 
   sqlite:

django_enum/__init__.py

@@ -48,4 +48,4 @@
 __version__ = '.'.join(str(i) for i in VERSION)
 __author__ = 'Brian Kohan'
 __license__ = 'MIT'
-__copyright__ = 'Copyright 2022-2023 Brian Kohan'
+__copyright__ = 'Copyright 2022-2024 Brian Kohan'

django_enum/choices.py

@@ -8,9 +8,14 @@
 from django.db.models import Choices
 from django.db.models import IntegerChoices as DjangoIntegerChoices
 from django.db.models import TextChoices as DjangoTextChoices
-from django.db.models.enums import ChoicesMeta
 from django_enum.utils import choices, names
 
+try:
+    from django.db.models.enums import ChoicesType
+except ImportError:  # pragma: no cover
+    from django.db.models.enums import ChoicesMeta as ChoicesType
+
+
 DEFAULT_BOUNDARY = getattr(enum, 'KEEP', None)
 
 
@@ -22,7 +27,7 @@
     )
 
 
-    class DjangoEnumPropertiesMeta(EnumPropertiesMeta, ChoicesMeta):
+    class DjangoEnumPropertiesMeta(EnumPropertiesMeta, ChoicesType):
         """
         A composite meta class that combines Django's Choices metaclass with
         enum-properties metaclass. This metaclass will add Django's expected
@@ -36,15 +41,15 @@ def names(cls):
             For some eccentric enums list(Enum) is empty, so we override names
             if empty
             """
-            return ChoicesMeta.names.fget(cls) or names(cls, override=True)
+            return ChoicesType.names.fget(cls) or names(cls, override=True)
 
         @property
         def choices(cls):
             """
             For some eccentric enums list(Enum) is empty, so we override
             choices if empty
             """
-            return ChoicesMeta.choices.fget(cls) or choices(cls, override=True)
+            return ChoicesType.choices.fget(cls) or choices(cls, override=True)
 
 
     class DjangoSymmetricMixin(SymmetricMixin):
@@ -55,7 +60,7 @@ class DjangoSymmetricMixin(SymmetricMixin):
         _symmetric_builtins_ = ['name', 'label']
 
 
-    class TextChoices(
+    class TextChoices(  # pylint: disable=too-many-ancestors
         DjangoSymmetricMixin,
         DjangoTextChoices,
         metaclass=DjangoEnumPropertiesMeta
@@ -69,7 +74,7 @@ def __hash__(self):
             return DjangoTextChoices.__hash__(self)
 
 
-    class IntegerChoices(
+    class IntegerChoices(  # pylint: disable=too-many-ancestors
         DjangoSymmetricMixin,
         DjangoIntegerChoices,
         metaclass=DjangoEnumPropertiesMeta
@@ -97,6 +102,9 @@ class FloatChoices(
         def __hash__(self):
             return float.__hash__(self)
 
+        def __str__(self):
+            return str(self.value)
+
 
     # mult inheritance type hint bug
     class FlagChoices(  # type: ignore
@@ -138,7 +146,7 @@ def __init__(self, *args, **kwargs):  # pylint: disable=W0231
     DjangoSymmetricMixin = MissingEnumProperties  # type: ignore
 
 
-    class DjangoEnumPropertiesMeta(ChoicesMeta):  # type: ignore
+    class DjangoEnumPropertiesMeta(ChoicesType):  # type: ignore
         """
         Throw error if metaclass is used without enum-properties
 

django_enum/fields.py

@@ -34,6 +34,7 @@
 )
 from django.db.models.constraints import CheckConstraint
 from django.db.models.query_utils import DeferredAttribute
+
 from django.utils.deconstruct import deconstructible
 from django.utils.duration import duration_string
 from django.utils.functional import cached_property
@@ -58,6 +59,13 @@
     with_typehint,
 )
 
+try:
+    from django.db.models.expressions import DatabaseDefault
+except ImportError:  # pragma: no cover
+    class DatabaseDefault:  # type: ignore
+        """Spoof DatabaseDefault for Django < 5.0"""
+
+
 CONFORM: Union[Enum, Type[NOT_PROVIDED]]
 EJECT: Union[Enum, Type[NOT_PROVIDED]]
 STRICT: Union[Enum, Type[NOT_PROVIDED]]
@@ -112,7 +120,11 @@ class ToPythonDeferredAttribute(DeferredAttribute):
 
     def __set__(self, instance: Model, value: Any):
         try:
-            instance.__dict__[self.field.name] = self.field.to_python(value)
+            instance.__dict__[self.field.name] = (
+                value
+                if isinstance(value, DatabaseDefault) else
+                self.field.to_python(value)
+            )
         except (ValidationError, ValueError):
             # Django core fields allow assignment of any value, we do the same
             instance.__dict__[self.field.name] = value
@@ -488,15 +500,15 @@ def _try_coerce(
         and non-strict, coercion to enum's primitive type will be done,
         otherwise a ValueError is raised.
         """
-        if (
-            (self.coerce or force)
-            and self.enum is not None
-            and not isinstance(value, self.enum)
-        ):
+        if self.enum is None:
+            return value
+
+        if (self.coerce or force) and not isinstance(value, self.enum):
             try:
                 value = self.enum(value)  # pylint: disable=E1102
             except (TypeError, ValueError):
                 try:
+                    # value = self.primitive(value)
                     value = self._coerce_to_value_type(value)
                     value = self.enum(value)  # pylint: disable=E1102
                 except (TypeError, ValueError, DecimalException):
@@ -520,12 +532,13 @@ def _try_coerce(
                                 f"{self.enum.__name__} required by field "
                                 f"{self.name}."
                             ) from err
+
         elif not self.coerce:
             try:
                 return self._coerce_to_value_type(value)
             except (TypeError, ValueError, DecimalException) as err:
                 raise ValueError(
-                    f"'{value}' is not a valid {self.primitive} "
+                    f"'{value}' is not a valid {self.primitive.__name__} "
                     f"required by field {self.name}."
                 ) from err
         return value

django_enum/tests/db_default/__init__.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class DBDefaultConfig(AppConfig):
+    name = 'django_enum.tests.db_default'
+    label = name.replace('.', '_')