Merge pull request #159 from django-commons/auto

Upgrade minimum enum_properties version to 2.5.1

Author: bckohan

.github/workflows/test.yml

@@ -49,7 +49,6 @@ jobs:
         psycopg-version: ['psycopg2', 'psycopg3']
         django-version:
           - '4.2' # LTS April 2026
-          - '5.1' # December 2025
           - '5.2' # LTS April 2028
           - '6.0' # April 2027
         exclude:
@@ -62,18 +61,13 @@ jobs:
           - postgres-version: '12'
             psycopg-version: 'psycopg3'
 
-          - postgres-version: '12'
-            django-version: '5.1'
-
           - postgres-version: '12'
             django-version: '5.2'
 
           # https://github.com/psycopg/psycopg2/pull/1695
           - python-version: '3.13'
             psycopg-version: 'psycopg2'
 
-          - python-version: '3.14'
-            django-version: '5.1'
           # https://github.com/psycopg/psycopg2/pull/1695
           - python-version: '3.14'
             psycopg-version: 'psycopg2'
@@ -520,8 +514,8 @@ jobs:
         python-version: ['3.10', '3.12', '3.14']
         django-version:
           - '4.2' # LTS April 2026
-          - '5.2' # LTS April 2028
-          - '6.0' # April 2027
+          - '5.2.10' # LTS April 2028
+          - '6.0.1' # April 2027
         oracle-version:
           - 'oracle-xe:21'
           - 'oracle-free:latest'
@@ -532,20 +526,20 @@ jobs:
             django-version: '4.2'
 
           - python-version: '3.10'
-            django-version: '5.2'
+            django-version: '5.2.10'
           - python-version: '3.14'
-            django-version: '5.2'
+            django-version: '5.2.10'
 
           - python-version: '3.10'
-            django-version: '6.0'
+            django-version: '6.0.1'
           - python-version: '3.12'
-            django-version: '6.0'
+            django-version: '6.0.1'
 
           - django-version: '4.2'
             oracle-version: 'oracle-free:latest'
-          - django-version: '5.2'
+          - django-version: '5.2.10'
             oracle-version: 'oracle-xe:21'
-          - django-version: '6.0'
+          - django-version: '6.0.1'
             oracle-version: 'oracle-xe:21'
 
     services:

justfile

@@ -268,7 +268,7 @@ validate_version VERSION:
     assert raw_version == django_enum.__version__
     print(raw_version)
 
-# issue a relase for the given semver string (e.g. 2.1.0)
+# issue a release for the given semver string (e.g. 2.1.0)
 release VERSION:
     @just validate_version v{{ VERSION }}
     git tag -s v{{ VERSION }} -m "{{ VERSION }} Release"

pyproject.toml

@@ -23,7 +23,6 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Development Status :: 5 - Production/Stable",
     "Framework :: Django :: 4.2",
-    "Framework :: Django :: 5.1",
     "Framework :: Django :: 5.2",
     "Framework :: Django :: 6.0",
     "Intended Audience :: Developers",
@@ -59,8 +58,7 @@ packages = ["src/django_enum"]
 
 [project.optional-dependencies]
 properties = [
-    "enum-properties>=2.3.0; python_version < '3.14'",
-    "enum-properties>=2.4.0; python_version >= '3.14'",
+    "enum-properties>=2.5.1"
 ]
 filters = ["django-filter>=21"]
 rest = ["djangorestframework>=3.9,<4.0"]
@@ -100,7 +98,7 @@ dev = [
     "pytest-env>=1.1.5",
     "pytest-playwright>=0.7.0",
     "python-dateutil>=2.9.0.post0",
-    "ruff>=0.9.7",
+    "ruff>=0.15.0",
     "tomlkit>=0.13.2",
     "tqdm>=4.67.1",
     "types-pyyaml>=6.0.12.20241230",
@@ -187,6 +185,7 @@ exclude = [
     "examples",
     "plot_benchmarks.py"
 ]
+target-version = "py310"
 
 [tool.ruff.lint]
 exclude = ["tests/**/*"]

src/django_enum/choices.py

@@ -89,7 +89,7 @@ def __hash__(self):
         return DjangoTextChoices.__hash__(self)
 
 
-class IntegerChoices(
+class IntegerChoices(  # type: ignore[metaclass]
     DjangoSymmetricMixin, DjangoIntegerChoices, metaclass=DjangoEnumPropertiesMeta
 ):
     """
@@ -101,7 +101,7 @@ def __hash__(self):
         return DjangoIntegerChoices.__hash__(self)
 
 
-class FloatChoices(
+class FloatChoices(  # type: ignore[metaclass]
     DjangoSymmetricMixin, float, Choices, metaclass=DjangoEnumPropertiesMeta
 ):
     """

tests/test_auto.py

@@ -0,0 +1,46 @@
+import pytest
+
+pytest.importorskip("enum_properties")
+
+import sys
+from django.test import TestCase
+from django_enum.choices import TextChoices
+from enum import auto
+
+
+@pytest.mark.skipif(sys.version_info < (3, 11), reason="Requires Python 3.11 or higher")
+class TestAutoWithChoices(TestCase):
+    def test_auto_with_choices(self):
+
+        class MyTextChoices(TextChoices):
+            custom_value: str
+
+            FOO = auto(), "FOO Label", "foo123"
+            BAR = auto(), "BAR Label", "bar123"
+
+        self.assertEqual(MyTextChoices.FOO.value, "FOO")
+        self.assertEqual(MyTextChoices.BAR.value, "BAR")
+
+        self.assertEqual(MyTextChoices.FOO.label, "FOO Label")
+        self.assertEqual(MyTextChoices.BAR.label, "BAR Label")
+
+        self.assertEqual(MyTextChoices.FOO.custom_value, "foo123")
+        self.assertEqual(MyTextChoices.BAR.custom_value, "bar123")
+
+        class MyTextChoicesAutoOverride(TextChoices):
+            def _generate_next_value_(name, start, count, last_values):
+                return name.title() * 2
+
+            custom_value: str
+
+            FOO = auto(), "FOO Label", "foo123"
+            BAR = auto(), "BAR Label", "bar123"
+
+        self.assertEqual(MyTextChoicesAutoOverride.FOO.value, "FooFoo")
+        self.assertEqual(MyTextChoicesAutoOverride.BAR.value, "BarBar")
+
+        self.assertEqual(MyTextChoicesAutoOverride.FOO.label, "FOO Label")
+        self.assertEqual(MyTextChoicesAutoOverride.BAR.label, "BAR Label")
+
+        self.assertEqual(MyTextChoicesAutoOverride.FOO.custom_value, "foo123")
+        self.assertEqual(MyTextChoicesAutoOverride.BAR.custom_value, "bar123")