ducktools-classbuilder 0.8.2__tar.gz → 0.8.4__tar.gz

{ducktools_classbuilder-0.8.2 → ducktools_classbuilder-0.8.4}/.github/workflows/auto_test.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.13", "3.12", "3.11", "3.10", "pypy-3.10", "3.9", "3.8"]
+        python-version: ["3.14-dev", "3.13", "3.12", "3.11", "3.10", "pypy-3.10", "3.9", "3.8"]
 
     steps:
     - uses: actions/checkout@v4

{ducktools_classbuilder-0.8.2 → ducktools_classbuilder-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ducktools-classbuilder
-Version: 0.8.2
+Version: 0.8.4
 Summary: Toolkit for creating class boilerplate generators
 Author: David C Ellis
 Project-URL: Homepage, https://github.com/davidcellis/ducktools-classbuilder

{ducktools_classbuilder-0.8.2 → ducktools_classbuilder-0.8.4}/src/ducktools/classbuilder/__init__.py

@@ -33,7 +33,7 @@
 import os
 
 from .annotations import get_ns_annotations, is_classvar
-from ._version import __version__, __version_tuple__
+from ._version import __version__, __version_tuple__  # noqa: F401
 
 # Change this name if you make heavy modifications
 INTERNALS_DICT = "__classbuilder_internals__"
@@ -280,7 +280,7 @@ def get_init_generator(null=NOTHING, extra_code=None):
 
         assigns = "\n    ".join(assignments) if assignments else "pass\n"
         code = (
-            f"def {funcname}(self, {args}):\n" 
+            f"def {funcname}(self, {args}):\n"
             f"    {assigns}\n"
         )
         # Handle additional function calls
@@ -663,10 +663,10 @@ class Field(metaclass=SlotMakerMeta):
     def from_field(cls, fld, /, **kwargs):
         """
         Create an instance of field or subclass from another field.
-        
-        This is intended to be used to convert a base 
+
+        This is intended to be used to convert a base
         Field into a subclass.
-        
+
         :param fld: field class to convert
         :param kwargs: Additional keyword arguments for subclasses
         :return: new field subclass instance
@@ -762,7 +762,9 @@ def make_annotation_gatherer(
         else:
             cls_dict = cls_or_ns.__dict__
 
-        cls_fields: dict[str, field_type] = {}
+        # This should really be dict[str, field_type] but static analysis
+        # doesn't understand this.
+        cls_fields: dict[str, Field] = {}
         modifications = {}
 
         cls_annotations = get_ns_annotations(cls_dict)

ducktools_classbuilder-0.8.4/src/ducktools/classbuilder/_version.py

@@ -0,0 +1,2 @@
+__version__ = "0.8.4"
+__version_tuple__ = (0, 8, 4)

{ducktools_classbuilder-0.8.2 → ducktools_classbuilder-0.8.4}/src/ducktools/classbuilder/annotations.py

@@ -23,39 +23,12 @@ import sys
 
 
 class _LazyAnnotationLib:
-    def __init__(self):
-        if sys.version_info < (3, 14):
-            self.annotationlib_unavailable = True
-        else:
-            self.annotationlib_unavailable = None
-
     def __getattr__(self, item):
-        if self.annotationlib_unavailable:
-            raise ImportError("'annotationlib' is not available")
-
-        try:
-            import annotationlib
-        except ImportError:
-            self.annotationlib_unavailable = True
-            raise ImportError("'annotationlib' is not available")
-        else:
-            self.Format = annotationlib.Format
-            self.call_annotate_function = annotationlib.call_annotate_function
-
-            # This function keeps getting changed and renamed
-            get_ns_annotate = getattr(annotationlib, "get_annotate_from_class_namespace", None)
-            if get_ns_annotate is None:
-                get_ns_annotate = getattr(annotationlib, "get_annotate_function")
-            self.get_ns_annotate = get_ns_annotate
+        global _lazyannotationlib
+        import annotationlib  # type: ignore - this is a Python 3.14 library
+        _lazyannotationlib = annotationlib
+        return getattr(annotationlib, item)
 
-            if item == "Format":
-                return self.Format
-            elif item == "call_annotate_function":
-                return self.call_annotate_function
-            elif item == "get_ns_annotate":
-                return get_ns_annotate
-
-        raise AttributeError(f"{item!r} is not available from this lazy importer")
 
 _lazy_annotationlib = _LazyAnnotationLib()
 
@@ -72,19 +45,14 @@ def get_ns_annotations(ns):
     annotations = ns.get("__annotations__")
     if annotations is not None:
         annotations = annotations.copy()
-    else:
-        try:
-            # See if we're using PEP-649 annotations
-            annotate = ns.get("__annotate__")  # Works in the early alphas
-            if not annotate:
-                annotate = _lazy_annotationlib.get_ns_annotate(ns)
-            if annotate:
-                annotations = _lazy_annotationlib.call_annotate_function(
-                    annotate,
-                    format=_lazy_annotationlib.Format.FORWARDREF
-                )
-        except ImportError:
-            pass
+    elif sys.version_info >= (3, 14):
+        # See if we're using PEP-649 annotations
+        annotate = _lazy_annotationlib.get_annotate_from_class_namespace(ns)
+        if annotate:
+            annotations = _lazy_annotationlib.call_annotate_function(
+                annotate,
+                format=_lazy_annotationlib.Format.FORWARDREF
+            )
 
     if annotations is None:
         annotations = {}
@@ -125,4 +93,3 @@ def is_classvar(hint):
             ):
                 return True
     return False
-

{ducktools_classbuilder-0.8.2 → ducktools_classbuilder-0.8.4}/src/ducktools/classbuilder/prefab.py

@@ -36,7 +36,7 @@ from . import (
 
 # These aren't used but are re-exported for ease of use
 # noinspection PyUnresolvedReferences
-from . import SlotFields, KW_ONLY
+from . import SlotFields, KW_ONLY  # noqa: F401
 
 PREFAB_FIELDS = "PREFAB_FIELDS"
 PREFAB_INIT_FUNC = "__prefab_init__"

{ducktools_classbuilder-0.8.2 → ducktools_classbuilder-0.8.4}/src/ducktools/classbuilder/prefab.pyi

@@ -125,23 +125,56 @@ class Prefab(metaclass=SlotMakerMeta):
         recursive_repr: bool = False,
     ) -> None: ...
 
-
-# For some reason PyCharm can't see 'attribute'?!?
-# noinspection PyUnresolvedReferences
+# As far as I can tell these are the correct types
+# But mypy.stubtest crashes trying to analyse them
+# Due to the combination of overload and dataclass_transform
+# @typing.overload
+# def prefab(
+#     cls: None = None,
+#     *,
+#     init: bool = ...,
+#     repr: bool = ...,
+#     eq: bool = ...,
+#     iter: bool = ...,
+#     match_args: bool = ...,
+#     kw_only: bool = ...,
+#     frozen: bool = ...,
+#     dict_method: bool = ...,
+#     recursive_repr: bool = ...,
+# ) -> Callable[[type[_T]], type[_T]]: ...
+
+# @dataclass_transform(field_specifiers=(Attribute, attribute))
+# @typing.overload
+# def prefab(
+#     cls: type[_T],
+#     *,
+#     init: bool = ...,
+#     repr: bool = ...,
+#     eq: bool = ...,
+#     iter: bool = ...,
+#     match_args: bool = ...,
+#     kw_only: bool = ...,
+#     frozen: bool = ...,
+#     dict_method: bool = ...,
+#     recursive_repr: bool = ...,
+# ) -> type[_T]: ...
+
+# As mypy crashes, and the only difference is the return type
+# just return `Any` for now to avoid the overload.
 @dataclass_transform(field_specifiers=(Attribute, attribute))
 def prefab(
-    cls: type[_T] | None = None,
+    cls: type[_T] | None = ...,
     *,
-    init: bool = True,
-    repr: bool = True,
-    eq: bool = True,
-    iter: bool = False,
-    match_args: bool = True,
-    kw_only: bool = False,
-    frozen: bool = False,
-    dict_method: bool = False,
-    recursive_repr: bool = False,
-) -> type[_T] | Callable[[type[_T]], type[_T]]: ...
+    init: bool = ...,
+    repr: bool = ...,
+    eq: bool = ...,
+    iter: bool = ...,
+    match_args: bool = ...,
+    kw_only: bool = ...,
+    frozen: bool = ...,
+    dict_method: bool = ...,
+    recursive_repr: bool = ...,
+) -> typing.Any: ...
 
 def build_prefab(
     class_name: str,

{ducktools_classbuilder-0.8.2 → ducktools_classbuilder-0.8.4}/src/ducktools_classbuilder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ducktools-classbuilder
-Version: 0.8.2
+Version: 0.8.4
 Summary: Toolkit for creating class boilerplate generators
 Author: David C Ellis
 Project-URL: Homepage, https://github.com/davidcellis/ducktools-classbuilder

{ducktools_classbuilder-0.8.2 → ducktools_classbuilder-0.8.4}/src/ducktools_classbuilder.egg-info/SOURCES.txt

@@ -82,4 +82,5 @@ tests/prefab/shared/examples/fails/creation_5.py
 tests/prefab/shared/examples/fails/inheritance_1.py
 tests/prefab/shared/examples/fails/inheritance_2.py
 tests/py312_tests/test_generic_annotations.py
+tests/py314_tests/_test_support.py
 tests/py314_tests/test_forwardref_annotations.py

ducktools_classbuilder-0.8.4/tests/py314_tests/_test_support.py

@@ -0,0 +1,42 @@
+from annotationlib import ForwardRef
+
+# From test/support/__init__.py
+class EqualToForwardRef:
+    """Helper to ease use of annotationlib.ForwardRef in tests.
+
+    This checks only attributes that can be set using the constructor.
+
+    """
+
+    def __init__(
+        self,
+        arg,
+        *,
+        module=None,
+        owner=None,
+        is_class=False,
+    ):
+        self.__forward_arg__ = arg
+        self.__forward_is_class__ = is_class
+        self.__forward_module__ = module
+        self.__owner__ = owner
+
+    def __eq__(self, other):
+        if not isinstance(other, (EqualToForwardRef, ForwardRef)):
+            return NotImplemented
+        return (
+            self.__forward_arg__ == other.__forward_arg__
+            and self.__forward_module__ == other.__forward_module__
+            and self.__forward_is_class__ == other.__forward_is_class__
+            and self.__owner__ == other.__owner__
+        )
+
+    def __repr__(self):
+        extra = []
+        if self.__forward_module__ is not None:
+            extra.append(f", module={self.__forward_module__!r}")
+        if self.__forward_is_class__:
+            extra.append(", is_class=True")
+        if self.__owner__ is not None:
+            extra.append(f", owner={self.__owner__!r}")
+        return f"EqualToForwardRef({self.__forward_arg__!r}{''.join(extra)})"

{ducktools_classbuilder-0.8.2 → ducktools_classbuilder-0.8.4}/tests/py314_tests/test_forwardref_annotations.py

@@ -1,12 +1,14 @@
 # Bare forwardrefs only work in 3.14 or later
 
 from ducktools.classbuilder.annotations import get_ns_annotations
-from annotationlib import ForwardRef
 
 from pathlib import Path
 
+from _test_support import EqualToForwardRef
+
 global_type = int
 
+
 def test_bare_forwardref():
     class Ex:
         a: str
@@ -15,7 +17,7 @@ def test_bare_forwardref():
 
     annos = get_ns_annotations(Ex.__dict__)
 
-    assert annos == {'a': str, 'b': Path, 'c': ForwardRef("plain_forwardref")}
+    assert annos == {'a': str, 'b': Path, 'c': EqualToForwardRef("plain_forwardref")}
 
 
 def test_inner_outer_ref():
@@ -38,7 +40,7 @@ def test_inner_outer_ref():
     cls, annos = make_func()
 
     # Forwardref given as string if used before it can be evaluated
-    assert annos == {"a_val": str, "b_val": int, "c_val": ForwardRef("hyper_type")}
+    assert annos == {"a_val": str, "b_val": int, "c_val": EqualToForwardRef("hyper_type")}
 
     # Correctly evaluated if it exists
     assert get_ns_annotations(cls.__dict__) == {

ducktools_classbuilder-0.8.2/src/ducktools/classbuilder/_version.py

@@ -1,2 +0,0 @@
-__version__ = "0.8.2"
-__version_tuple__ = (0, 8, 2)