fixes for django 5

Author: bckohan

.github/workflows/test.yml

@@ -10,19 +10,21 @@ jobs:
         python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '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.8'
+            django-version: 'Django~=5.0.0'
+          - python-version: '3.9'
+            django-version: 'Django~=5.0.0'
           - python-version: '3.11'
             django-version: 'Django~=3.2.0'
           - python-version: '3.12'
             django-version: 'Django~=3.2.0'
-          - python-version: '3.12'
-            django-version: 'Django~=4.1.0'
 
     steps:
     - uses: actions/checkout@v2

django_enum/__init__.py

@@ -47,7 +47,7 @@
     'EnumFilter'
 ]
 
-VERSION = (1, 2, 2)
+VERSION = (1, 2, 3)
 
 __title__ = 'Django Enum'
 __version__ = '.'.join(str(i) for i in VERSION)

django_enum/choices.py

@@ -9,7 +9,11 @@
 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
+
+try:
+    from django.db.models.enums import ChoicesType
+except ImportError:  # pragma: no cover
+    from django.db.models.enums import ChoicesMeta as ChoicesType
 
 
 def choices(enum: Optional[Type[Enum]]) -> List[Tuple[Any, str]]:
@@ -87,7 +91,7 @@ def values(enum: Optional[Type[Enum]]) -> List[Any]:
     from enum_properties import EnumPropertiesMeta, SymmetricMixin
 
 
-    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
@@ -162,7 +166,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

@@ -83,6 +83,7 @@ class EnumMixin(
     enum: Optional[Type[Enum]] = None
     strict: bool = True
     coerce: bool = True
+    primitive: Optional[Type[Any]] = None
 
     descriptor_class = ToPythonDeferredAttribute
 
@@ -91,7 +92,7 @@ def _coerce_to_value_type(self, value: Any) -> Enum:
         # note if enum type is int and a floating point is passed we could get
         # situations like X.xxx == X - this is acceptable
         if self.enum:
-            return type(values(self.enum)[0])(value)
+            return self.primitive(value)
         # can't ever reach this - just here to make type checker happy
         return value  # pragma: no cover
 
@@ -109,6 +110,7 @@ def __init__(
         self.coerce = coerce if enum else False
         if self.enum is not None:
             kwargs.setdefault('choices', choices(enum))
+            self.primitive = type(values(self.enum)[0])
         super().__init__(*args, **kwargs)
 
     def _try_coerce(
@@ -145,6 +147,18 @@ def _try_coerce(
                                 f"{self.enum.__name__} "
                                 f"required by field {self.name}."
                             ) from err
+        elif (
+            not self.coerce and self.primitive and
+            not isinstance(value, self.primitive) and
+            self.enum and not isinstance(value, self.enum)
+        ):
+            try:
+                value = self._coerce_to_value_type(value)
+            except (TypeError, ValueError) as err:
+                raise ValueError(
+                    f"'{value}' is not a valid {self.primitive} "
+                    f"required by field {self.name}."
+                ) from err
         return value
 
     def deconstruct(self) -> Tuple[str, str, List, dict]:

django_enum/forms.py

@@ -217,3 +217,8 @@ def validate(self, value):
                 code='invalid_choice',
                 params={'value': value},
             )
+
+    def clean(self, value: Any) -> Union[Enum, Any]:
+        """Return the value as its full enumeration object"""
+        value = super().clean(value)
+        return value

django_enum/tests/djenum/enums.py

@@ -5,7 +5,9 @@
 
 
 class FloatChoices(float, Choices):
-    pass
+    
+    def __str__(self):
+        return str(self.value)
 
 
 class DJIntEnum(IntegerChoices):

django_enum/tests/djenum/views.py

@@ -48,6 +48,10 @@ class EnumTesterCreateView(URLMixin, CreateView):
     fields = '__all__'
 
 
+    def post(self, request, *args, **kwargs):
+        return super().post(request, *args, **kwargs)
+    
+
 class EnumTesterUpdateView(URLMixin, UpdateView):
     model = EnumTester
     template_name = 'enumtester_form.html'

doc/requirements.txt

@@ -6,4 +6,4 @@ sphinxcontrib-htmlhelp==2.0.1; python_version >= "3.5"
 sphinxcontrib-jsmath==1.0.1; python_version >= "3.5"
 sphinxcontrib-qthelp==1.0.3; python_version >= "3.5"
 sphinxcontrib-serializinghtml==1.1.5; python_version >= "3.5"
-django-enum==1.2.2
+django-enum==1.2.3

doc/source/changelog.rst

@@ -2,6 +2,11 @@
 Change Log
 ==========
 
+v1.2.3
+======
+
+* Added `Support Django 5.0 <https://github.com/bckohan/django-enum/issues/54>`_
+
 v1.2.2
 ======
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-enum"
-version = "1.2.2"
+version = "1.2.3"
 description = "Full and natural support for enumerations as Django model fields."
 authors = ["Brian Kohan <[email protected]>"]
 license = "MIT"
@@ -18,6 +18,7 @@ classifiers = [
     "Framework :: Django :: 4.0",
     "Framework :: Django :: 4.1",
     "Framework :: Django :: 4.2",
+    "Framework :: Django :: 5.0",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Natural Language :: English",
@@ -41,7 +42,7 @@ exclude = ["django_enum/tests"]
 
 [tool.poetry.dependencies]
 python = ">=3.7,<4.0"
-Django = ">=3.2,<5.0"
+Django = ">=3.2,<6.0"
 enum-properties = {version = "^1.7.0", optional = true}
 django-filter = {version = ">=21,<24", optional = true}
 djangorestframework = {version = "^3.9", optional = true}