TypeDAL 3.7.0__tar.gz → 3.7.1__tar.gz

{typedal-3.7.0 → typedal-3.7.1}/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 <!--next-version-placeholder-->
 
+## v3.7.1 (2024-10-09)
+
+### Fix
+
+* Prepare for python 3.13 (-> cgi dependency, changes in forward reference evaluation); except psycopg2 ([`bbcca8f`](https://github.com/trialandsuccess/TypeDAL/commit/bbcca8f7a5d2f8a6ddc8caf3a1b05fde3ed2fdd2))
+* Require legacy-cgi for python 3.13+ ([`7ba9489`](https://github.com/trialandsuccess/TypeDAL/commit/7ba94898cde600008a350e718783a4d0dbc05e45))
+
+### Documentation
+
+* **readme:** Include `from typedal.helpers import get_db` in example ([`8853052`](https://github.com/trialandsuccess/TypeDAL/commit/8853052575b4576945901eb87da94bf709e99526))
+
 ## v3.7.0 (2024-08-17)
 
 ### Feature

{typedal-3.7.0 → typedal-3.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: TypeDAL
-Version: 3.7.0
+Version: 3.7.1
 Summary: Typing support for PyDAL
 Project-URL: Documentation, https://typedal.readthedocs.io/
 Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues
@@ -12,16 +12,18 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
 Requires-Dist: configurable-json
 Requires-Dist: configuraptor>=1.26.2
 Requires-Dist: dill
+Requires-Dist: legacy-cgi; python_version >= '3.13'
 Requires-Dist: pydal
 Requires-Dist: python-slugify
 Provides-Extra: all
-Requires-Dist: edwh-migrate>=0.8.0; extra == 'all'
+Requires-Dist: edwh-migrate[full]>=0.8.0; extra == 'all'
 Requires-Dist: py4web; extra == 'all'
 Requires-Dist: pydal2sql[all]>=1.2.0; extra == 'all'
 Requires-Dist: questionary; extra == 'all'
@@ -318,6 +320,8 @@ These helpers are useful for scenarios where direct access to the PyDAL objects
 An example of this is when you need to do a `db.commit()` but you can't import `db` directly:
 
 ```python
+from typedal.helpers import get_db #, get_table, get_field
+
 MyTable.insert(...)
 db = get_db(MyTable)
 db.commit() # this is usually done automatically but sometimes you want to manually commit.

{typedal-3.7.0 → typedal-3.7.1}/README.md

@@ -264,6 +264,8 @@ These helpers are useful for scenarios where direct access to the PyDAL objects
 An example of this is when you need to do a `db.commit()` but you can't import `db` directly:
 
 ```python
+from typedal.helpers import get_db #, get_table, get_field
+
 MyTable.insert(...)
 db = get_db(MyTable)
 db.commit() # this is usually done automatically but sometimes you want to manually commit.

{typedal-3.7.0 → typedal-3.7.1}/pyproject.toml

@@ -19,6 +19,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
@@ -28,6 +29,7 @@ dependencies = [
     "configuraptor >= 1.26.2", # config
     "Configurable-JSON", # json dumping
     "python-slugify",
+    "legacy-cgi; python_version >= '3.13'"
 ]
 
 [project.optional-dependencies]
@@ -49,7 +51,7 @@ all = [
     "typer",
     "tabulate",
     "pydal2sql[all]>=1.2.0",
-    "edwh-migrate>=0.8.0",
+    "edwh-migrate[full]>=0.8.0",
     "questionary",
     "tomlkit",
 ]

{typedal-3.7.0 → typedal-3.7.1}/src/typedal/__about__.py

@@ -5,4 +5,4 @@ This file contains the Version info for this package.
 # SPDX-FileCopyrightText: 2023-present Robin van der Noord <robinvandernoord@gmail.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "3.7.0"
+__version__ = "3.7.1"

{typedal-3.7.0 → typedal-3.7.1}/src/typedal/core.py

@@ -8,6 +8,7 @@ import datetime as dt
 import inspect
 import json
 import math
+import sys
 import types
 import typing
 import warnings
@@ -339,6 +340,22 @@ def to_relationship(
     return Relationship(typing.cast(type[TypedTable], field), condition, typing.cast(JOIN_OPTIONS, join))
 
 
+def evaluate_forward_reference(fw_ref: typing.ForwardRef) -> type:
+    """
+    Extract the original type from a forward reference string.
+    """
+    kwargs = dict(
+        localns=locals(),
+        globalns=globals(),
+        recursive_guard=frozenset(),
+    )
+    if sys.version_info >= (3, 13):
+        # required since 3.13 and not supported before
+        kwargs["type_params"] = ()
+
+    return fw_ref._evaluate(**kwargs)  # type: ignore
+
+
 class TypeDAL(pydal.DAL):  # type: ignore
     """
     Drop-in replacement for pyDAL with layer to convert class-based table definitions to classical pydal define_tables.
@@ -465,6 +482,7 @@ class TypeDAL(pydal.DAL):  # type: ignore
         # when __future__.annotations is implemented, cls.__annotations__ will not work anymore as below.
         # proper way to handle this would be (but gives error right now due to Table implementing magic methods):
         # typing.get_type_hints(cls, globalns=None, localns=None)
+        # -> ERR e.g. `pytest -svxk cli` -> name 'BestFriend' is not defined
 
         # dirty way (with evil eval):
         # [eval(v) for k, v in cls.__annotations__.items()]
@@ -674,9 +692,8 @@ class TypeDAL(pydal.DAL):  # type: ignore
 
         if isinstance(ftype, str):
             # extract type from string
-            ftype = typing.get_args(Type[ftype])[0]._evaluate(
-                localns=locals(), globalns=globals(), recursive_guard=frozenset()
-            )
+            fw_ref: typing.ForwardRef = typing.get_args(Type[ftype])[0]
+            ftype = evaluate_forward_reference(fw_ref)
 
         if mapping := BASIC_MAPPINGS.get(ftype):
             # basi types
@@ -1144,7 +1161,7 @@ class TableMeta(type):
         """
         Add a before insert hook.
         """
-        cls._before_insert.append(fn)  # type: ignore
+        cls._before_insert.append(fn)
         return cls
 
     def after_insert(
@@ -1157,7 +1174,7 @@ class TableMeta(type):
         """
         Add an after insert hook.
         """
-        cls._after_insert.append(fn)  # type: ignore
+        cls._after_insert.append(fn)
         return cls
 
     def before_update(
@@ -1167,7 +1184,7 @@ class TableMeta(type):
         """
         Add a before update hook.
         """
-        cls._before_update.append(fn)  # type: ignore
+        cls._before_update.append(fn)
         return cls
 
     def after_update(
@@ -1177,7 +1194,7 @@ class TableMeta(type):
         """
         Add an after update hook.
         """
-        cls._after_update.append(fn)  # type: ignore
+        cls._after_update.append(fn)
         return cls
 
     def before_delete(cls: Type[T_MetaInstance], fn: typing.Callable[[Set], Optional[bool]]) -> Type[T_MetaInstance]: