require dataclass's attributes to be encapsulated in a tuple

Author: bckohan

doc/source/changelog.rst

@@ -7,6 +7,16 @@ v2.4.0 (2025-09-18)
 
 * Implemented `Support Python 3.14, drop 3.8 support <https://github.com/bckohan/enum-properties/issues/97>`_
 
+  .. warning::
+
+    If you are using a dataclass enum with additional properties, you will now need to encapsulate
+    the dataclass attributes in a tuple as the first element of the enum member tuple. This syntax
+    worked before but it was also lenient and took the first N elements of the member tuple that
+    were not properties. This change makes the syntax more explicit and less error prone and was
+    necessitated to support Python 3.14 because properties are determined after the enum member
+    values are set on the class due to lazy evaluation of annotations.
+
+
 v2.3.0 (2025-03-29)
 ===================
 

doc/source/howto.rst

@@ -277,12 +277,13 @@ enumeration for the following reasons:**
 
     EnumProperties also integrates with Enum's dataclass support!
     For example we can add a symmetric property to the Creature
-    enumeration like so:
+    enumeration like so (**note the tuple encapsulating the dataclass fields**):
 
 .. literalinclude:: ../../tests/examples/howto_dataclass_integration.py
 
 
 .. _howto_members_and_aliases:
+
 Get members and aliases
 -----------------------
 

src/enum_properties/__init__.py

@@ -538,10 +538,8 @@ def __setitem__(self, key, value):
                             for values in self._ep_properties_.values():
                                 values.append(value[idx])
                                 idx += 1
-                            if num_vals == 1:
-                                value = value[0]
-                            else:
-                                value = value[0:num_vals]
+
+                            value = value[0]
 
                         except TypeError as type_err:
                             raise ValueError(

tests/annotations/test_flags.py

@@ -409,8 +409,9 @@ def label(self):
 
         def test_enum_dataclass_support(self):
             """
-            In 3.12, Enum added support for dataclass inheritance which offers similar functionality
-            to enum-properties. This tests evaluates how these step on each other's toes.
+            In 3.12, Enum added support for dataclass inheritance which offers similar
+            functionality to enum-properties. This tests evaluates how these step on
+            each other's toes.
 
             From the std lib docs example:
             """
@@ -431,7 +432,7 @@ class CreatureDataHashableMixin:
             class CreatureHybrid(CreatureDataMixin, EnumProperties):
                 kingdom: Annotated[str, Symmetric()]
 
-                BEETLE = "small", 6, False, "insect"
+                BEETLE = ("small", 6, False), "insect"
                 DOG = (
                     (
                         "medium",
@@ -456,7 +457,7 @@ class CreatureHybrid(CreatureDataMixin, EnumProperties):
             class CreatureHybridSpecialized(CreatureDataMixin, EnumProperties):
                 kingdom: Annotated[str, Symmetric()]
 
-                BEETLE = "small", 6, "insect"
+                BEETLE = ("small", 6), "insect"
                 DOG = ("medium", 4, False), "mammal"
 
                 @specialize(BEETLE)
@@ -492,7 +493,7 @@ def function(self):
             class CreatureHybridSpecialized(CreatureDataHashableMixin, EnumProperties):
                 kingdom: Annotated[str, Symmetric()]
 
-                BEETLE = "small", 6, "insect"
+                BEETLE = ("small", 6), "insect"
                 DOG = (
                     (
                         "medium",

tests/examples/howto_dataclass_integration.py

@@ -14,8 +14,8 @@ class Creature(CreatureDataMixin, EnumProperties):
 
     kingdom: t.Annotated[str, Symmetric()]
 
-    BEETLE = 'small', 6, False, 'insect'
-    DOG = 'medium', 4, 'animal'
+    BEETLE = ('small', 6, False), 'insect'
+    DOG = ('medium', 4), 'animal'
 
 
 # you can now access the dataclass fields on the enumeration values

tests/legacy/test_flags.py

@@ -400,8 +400,8 @@ class CreatureDataHashableMixin:
                 tail: bool = field(repr=False, default=True)
 
             class Creature(CreatureDataMixin, EnumProperties):
-                BEETLE = "small", 6
-                DOG = "medium", 4
+                BEETLE = ("small", 6)
+                DOG = ("medium", 4)
 
             self.assertEqual(Creature.BEETLE.size, "small")
             self.assertEqual(Creature.BEETLE.legs, 6)
@@ -412,8 +412,8 @@ class Creature(CreatureDataMixin, EnumProperties):
             self.assertEqual(Creature.DOG.tail, True)
 
             class CreatureEP(CreatureDataMixin, EnumProperties):
-                BEETLE = "small", 6
-                DOG = "medium", 4, False
+                BEETLE = ("small", 6)
+                DOG = ("medium", 4, False)
 
             self.assertEqual(CreatureEP.BEETLE.size, "small")
             self.assertEqual(CreatureEP.BEETLE.legs, 6)
@@ -424,7 +424,7 @@ class CreatureEP(CreatureDataMixin, EnumProperties):
             self.assertEqual(CreatureEP.DOG.tail, False)
 
             class CreatureHybrid(CreatureDataMixin, EnumProperties, s("kingdom")):
-                BEETLE = "small", 6, False, "insect"
+                BEETLE = ("small", 6, False), "insect"
                 DOG = (
                     (
                         "medium",
@@ -449,7 +449,7 @@ class CreatureHybrid(CreatureDataMixin, EnumProperties, s("kingdom")):
             class CreatureHybridSpecialized(
                 CreatureDataMixin, EnumProperties, s("kingdom")
             ):
-                BEETLE = "small", 6, "insect"
+                BEETLE = ("small", 6), "insect"
                 DOG = ("medium", 4, False), "mammal"
 
                 @specialize(BEETLE)
@@ -485,7 +485,7 @@ def function(self):
             class CreatureHybridSpecialized(
                 CreatureDataHashableMixin, EnumProperties, s("kingdom")
             ):
-                BEETLE = "small", 6, "insect"
+                BEETLE = ("small", 6), "insect"
                 DOG = (
                     (
                         "medium",