add future annotations test - fix linting errors, revert some tests to previous mode

Author: bckohan

doc/source/changelog.rst

@@ -7,15 +7,6 @@ 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)
 ===================

src/enum_properties/__init__.py

@@ -406,7 +406,7 @@ class MyEnum(SymmetricMixin, enum.Enum, metaclass=EnumPropertiesMeta):
     __first_class_members__: t.List[str]
 
     @classmethod
-    def __prepare__(mcs, cls, bases, **kwargs):
+    def __prepare__(metacls, cls, bases, **kwds):  # type: ignore[override]
         """
         Strip properties out of inheritance and record them on our class
         dictionary for per-value based assignment in ``__new__``.
@@ -429,7 +429,7 @@ def __prepare__(mcs, cls, bases, **kwargs):
             else:
                 real_bases.append(base)
 
-        class_dict = super().__prepare__(cls, tuple(real_bases), **kwargs)
+        class_dict = super().__prepare__(cls, tuple(real_bases), **kwds)
 
         class _PropertyEnumDict(class_dict.__class__):  # type: ignore[name-defined]
             """
@@ -630,7 +630,7 @@ def __new__(mcs, classname, bases, classdict, **kwargs):
             In python 3.14+ annotations are loaded after enum members are
             defined, so we have to reconcile our properties here.
             """
-            from annotationlib import (
+            from annotationlib import (  # pyright: ignore[reportMissingImports]
                 Format,
                 call_annotate_function,
                 get_annotate_from_class_namespace,
@@ -901,7 +901,7 @@ def __hash__(self):
         return enum.Flag.__hash__(self)
 
 
-class IntFlagProperties(  # type: ignore[misc]
+class IntFlagProperties(
     DecomposeMixin, SymmetricMixin, enum.IntFlag, metaclass=EnumPropertiesMeta
 ):
     """

tests/annotations/test_flags.py

@@ -432,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",
@@ -457,8 +457,8 @@ class CreatureHybrid(CreatureDataMixin, EnumProperties):
             class CreatureHybridSpecialized(CreatureDataMixin, EnumProperties):
                 kingdom: Annotated[str, Symmetric()]
 
-                BEETLE = ("small", 6), "insect"
-                DOG = ("medium", 4, False), "mammal"
+                BEETLE = "small", 6, "insect"
+                DOG = "medium", 4, False, "mammal"
 
                 @specialize(BEETLE)
                 def function(self):
@@ -493,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/annotations/test_future_annotations.py

@@ -0,0 +1,2 @@
+from __future__ import annotations
+from tests.annotations.test import *

tests/legacy/test_flags.py

@@ -449,8 +449,8 @@ class CreatureHybrid(CreatureDataMixin, EnumProperties, s("kingdom")):
             class CreatureHybridSpecialized(
                 CreatureDataMixin, EnumProperties, s("kingdom")
             ):
-                BEETLE = ("small", 6), "insect"
-                DOG = ("medium", 4, False), "mammal"
+                BEETLE = "small", 6, "insect"
+                DOG = "medium", 4, False, "mammal"
 
                 @specialize(BEETLE)
                 def function(self):
@@ -485,7 +485,7 @@ def function(self):
             class CreatureHybridSpecialized(
                 CreatureDataHashableMixin, EnumProperties, s("kingdom")
             ):
-                BEETLE = ("small", 6), "insect"
+                BEETLE = "small", 6, "insect"
                 DOG = (
                     (
                         "medium",