Update ci to v6 and include 3.14

Author: frmdstryr

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
     services:
       postgres:
         image: postgres
@@ -25,9 +25,9 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Setup python ${{ matrix.python-version}}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
     services:
       mariadb:
         image: mariadb:latest
@@ -62,9 +62,9 @@ jobs:
             --health-timeout=5s
             --health-retries=3
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Setup python ${{ matrix.python-version}}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -82,17 +82,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
 
     services:
       mongodb:
         image: mongo
         ports:
           - 27017:27017
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Setup python ${{ matrix.python-version}}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -109,9 +109,9 @@ jobs:
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Setup python ${{ matrix.python-version}}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

atomdb/base.py

@@ -8,14 +8,14 @@
 Created on Jun 12, 2018
 """
 
-import asyncio
 import enum
 import logging
 import traceback
 from base64 import b64decode, b64encode
 from collections.abc import MutableMapping
 from datetime import date, datetime, time
 from decimal import Decimal
+from inspect import iscoroutinefunction
 from pprint import pformat
 from typing import Any, Callable, ClassVar
 from typing import Dict as DictType
@@ -310,7 +310,7 @@ async def unflatten(self, v: Any, scope: Optional[ScopeType] = None) -> Any:
                 py_type = v.pop("__py__")
                 coercer = self.coercers.get(py_type)
                 if coercer:
-                    if asyncio.iscoroutinefunction(coercer):
+                    if iscoroutinefunction(coercer):
                         return await coercer(v, scope)
                     return coercer(v, scope)
                 elif py_type == "set" or py_type == "atomset":
@@ -595,7 +595,7 @@ def generate_restorestate(cls: Type["Model"]) -> RestoreStateFn:
                 expr = f"await default_unflatten(state['{f}'], scope)"
         else:
             namespace[f"unflatten_{f}"] = unflatten
-            if asyncio.iscoroutinefunction(unflatten):
+            if iscoroutinefunction(unflatten):
                 expr = f"await unflatten_{f}(state['{f}'], scope)"
             else:
                 expr = f"unflatten_{f}(state['{f}'], scope)"

atomdb/sql.py

@@ -15,6 +15,7 @@
 import logging
 import weakref
 from decimal import Decimal
+from inspect import iscoroutinefunction
 from typing import Any
 from typing import Callable as CallableType
 from typing import ClassVar
@@ -2067,7 +2068,7 @@ def generate_sql_restorestate(cls: Type["SQLModel"]) -> RestoreStateFn:
         else:
             # Use provided unflatten function
             namespace[f"unflatten_{f}"] = unflatten
-            if asyncio.iscoroutinefunction(unflatten):
+            if iscoroutinefunction(unflatten):
                 expr = f"self.{f} = await unflatten_{f}(v, scope)"
             else:
                 expr = f"self.{f} = unflatten_{f}(v, scope)"

tests/test_benchmark.py

@@ -105,8 +105,7 @@ def test_serialize_flat(benchmark):
 @pytest.mark.benchmark(group="base")
 def test_restore_flat(benchmark):
     def run():
-        loop = asyncio.get_event_loop()
-        loop.run_until_complete(Product.restore(flat_state))
+        asyncio.run(Product.restore(flat_state))
 
     benchmark(run)
 
@@ -125,7 +124,6 @@ def test_serialize_nested(benchmark):
 @pytest.mark.benchmark(group="base")
 def test_restore_nested(benchmark):
     def run():
-        loop = asyncio.get_event_loop()
-        loop.run_until_complete(Page.restore(nested_state))
+        asyncio.run(Page.restore(nested_state))
 
     benchmark(run)