fix compatability

Author: joeblackwaslike

.gitignore

@@ -21,4 +21,5 @@ pytest-plugin-work
 old
 examples/two/
 *.sqlite
-*.db
+*.db
+.pdm-python

.python-version

@@ -1 +1 @@
-3.7.13
+3.8.16

pdm.lock

@@ -1,64 +1,56 @@
 [project]
 name = "quart-sqlalchemy"
-version = "3.0.2"
+version = "3.0.3"
 description = "SQLAlchemy for humans, with framework adapter for Quart."
 authors = [
     {name = "Joe Black", email = "[email protected]"},
 ]
 dependencies = [
-    "quart>=0.18.3",
-    "SQLAlchemy[asyncio]>=1.4.35, <2.1.0",
+    "quart<0.20.0,>=0.18.3",
+    "werkzeug<3.1.0,>=2.2.0",
+    "blinker<1.7,>=1.5",
+    "SQLAlchemy[asyncio]<2.1.0,>=2.0.0",
     "SQLAlchemy-Utils",
-    "anyio",
-    "aiosqlite",
-    "pydantic",
-    "tenacity",
+    "anyio~=3.3.4",
+    "pydantic~=1.10.13",
+    "tenacity~=8.0.1",
     "sqlapagination",
-    "exceptiongroup"
+    "exceptiongroup",
 ]
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 readme = "README.rst"
 license = {text = "MIT"}
 
 [project.urls]
 "Homepage" = "https://github.com/joeblackwaslike/quart-sqlalchemy"
 "Bug Tracker" = "https://github.com/joeblackwaslike/quart-sqlalchemy/issues"
 
+
 [build-system]
-requires = ["setuptools", "setuptools-scm"]
-build-backend = "setuptools.build_meta"
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"
 
 
-[project.optional-dependencies]
-tests = [
-    "pytest",
-    # "pytest-asyncio~=0.20.3",
-    # "pytest-asyncio @ https://github.com/joeblackwaslike/pytest-asyncio/releases/download/v0.20.4.dev42/pytest_asyncio-0.20.4.dev42-py3-none-any.whl",
-    "pytest-asyncio @ https://github.com/joeblackwaslike/pytest-asyncio/releases/download/v0.20.4.dev43/pytest_asyncio-0.20.4.dev43-py3-none-any.whl",
-    "pytest-mock",
-    "pytest-cov",
-    "coverage[toml]",
-]
+[tool.pdm.dev-dependencies]
 dev = [
-    "pre-commit",
-    "tox",
-    "tox-pdm",
-    "mypy",
-    "wemake-python-styleguide",
-    "IPython",
-    "black",
-]
-docs = [
-    "sphinx",
-    "pallets-sphinx-themes",
-    "sphinx-issues",
-    "sphinxcontrib-log-cabinet",
+    "pytest>=7.4.3",
+    # "pytest-asyncio~=0.20.3",
+    "pytest-asyncio @ https://github.com/joeblackwaslike/pytest-asyncio/releases/download/v0.20.4.dev42/pytest_asyncio-0.20.4.dev42-py3-none-any.whl",
+    "pytest-mock>=3.12.0",
+    "pytest-cov>=4.1.0",
+    "coverage[toml]>=7.3.2",
+    "aiosqlite>=0.19.0",
+    "pre-commit>=3.5.0",
+    "tox>=4.11.3",
+    "tox-pdm>=0.7.0",
+    "mypy>=1.7.0",
+    "ruff>=0.1.5",
 ]
 
+
 [tool.pdm.build]
 source-includes = [
     "docs/",
-    # "examples/",
     "tests/",
     "CHANGES.rst",
     "pdm.lock",

pyproject.toml

@@ -1,4 +1,4 @@
-__version__ = "3.0.2"
+__version__ = "3.0.3"
 
 from .bind import AsyncBind
 from .bind import Bind
@@ -21,3 +21,28 @@
 from .session import AsyncSession
 from .session import Session
 from .sqla import SQLAlchemy
+
+
+__all__ = [
+    "AsyncBind",
+    "AsyncBindConfig",
+    "AsyncSession",
+    "AsyncSessionmakerOptions",
+    "AsyncSessionOptions",
+    "Base",
+    "Bind",
+    "BindConfig",
+    "BindContext",
+    "ConfigBase",
+    "CoreExecutionOptions",
+    "EngineConfig",
+    "ORMExecutionOptions",
+    "Session",
+    "SessionOptions",
+    "SessionmakerOptions",
+    "SQLAlchemy",
+    "SQLAlchemyConfig",
+    "retry_config",
+    "retrying_async_session",
+    "retrying_session",
+]

src/quart_sqlalchemy/__init__.py

@@ -1 +1,4 @@
 from .extension import QuartSQLAlchemy
+
+
+__all__ = ["QuartSQLAlchemy"]

src/quart_sqlalchemy/framework/__init__.py

@@ -15,3 +15,24 @@
 from .mixins import TimestampMixin
 from .mixins import VersionMixin
 from .model import Base
+
+
+__all__ = [
+    "Base",
+    "CreatedTimestamp",
+    "DynamicArgsMixin",
+    "IdentityMixin",
+    "Json",
+    "PrimaryKey",
+    "PydanticType",
+    "RecursiveDictMixin",
+    "ReprMixin",
+    "setup_soft_delete_for_session",
+    "SimpleDictMixin",
+    "SoftDeleteMixin",
+    "TableNameMixin",
+    "TimestampMixin",
+    "TZDateTime",
+    "UpdatedTimestamp",
+    "VersionMixin",
+]

src/quart_sqlalchemy/model/__init__.py

@@ -106,11 +106,14 @@ def model_to_dict(
 
         mapper = sa.inspect(obj).mapper
         columns = [column.key for column in mapper.columns]
-        get_key_value = (
-            lambda c: (c, getattr(obj, c).isoformat())
-            if isinstance(getattr(obj, c), datetime)
-            else (c, getattr(obj, c))
-        )
+
+        def get_key_value(c):
+            return (
+                (c, getattr(obj, c).isoformat())
+                if isinstance(getattr(obj, c), datetime)
+                else (c, getattr(obj, c))
+            )
+
         data = dict(map(get_key_value, columns))
 
         if max_depth > 0:
@@ -125,7 +128,9 @@ def model_to_dict(
                 if relationship_children is not None:
                     if relation.uselist:
                         children = []
-                        for child in (c for c in relationship_children if c not in _children_seen):
+                        for child in (
+                            c for c in relationship_children if c not in _children_seen
+                        ):
                             _children_seen.add(child)
                             children.append(
                                 self.model_to_dict(
@@ -148,7 +153,9 @@ def model_to_dict(
 
 
 class IdentityMixin:
-    id: Mapped[int] = sa.orm.mapped_column(sa.Identity(), primary_key=True, autoincrement=True)
+    id: Mapped[int] = sa.orm.mapped_column(
+        sa.Identity(), primary_key=True, autoincrement=True
+    )
 
 
 class SoftDeleteMixin:

src/quart_sqlalchemy/model/mixins.py

@@ -3,16 +3,14 @@
 import sqlalchemy
 import sqlalchemy.orm
 from blinker import Namespace
-from quart.signals import AsyncNamespace
 
 
 sa = sqlalchemy
 
-sync_signals = Namespace()
-async_signals = AsyncNamespace()
+_signals = Namespace()
 
 
-before_bind_engine_created = sync_signals.signal(
+before_bind_engine_created = _signals.signal(
     "quart-sqlalchemy.bind.engine.created.before",
     doc="""Called before a bind creates an engine.
 
@@ -25,7 +23,7 @@ def handler(
             ...
     """,
 )
-after_bind_engine_created = sync_signals.signal(
+after_bind_engine_created = _signals.signal(
     "quart-sqlalchemy.bind.engine.created.after",
     doc="""Called after a bind creates an engine.
 
@@ -40,7 +38,7 @@ def handler(
     """,
 )
 
-before_bind_session_factory_created = sync_signals.signal(
+before_bind_session_factory_created = _signals.signal(
     "quart-sqlalchemy.bind.session_factory.created.before",
     doc="""Called before a bind creates a session_factory.
 
@@ -49,7 +47,7 @@ def handler(sender: t.Union[Bind, AsyncBind], options: Dict[str, Any]) -> None:
             ...
     """,
 )
-after_bind_session_factory_created = sync_signals.signal(
+after_bind_session_factory_created = _signals.signal(
     "quart-sqlalchemy.bind.session_factory.created.after",
     doc="""Called after a bind creates a session_factory.
 
@@ -64,7 +62,7 @@ def handler(
 )
 
 
-bind_context_entered = sync_signals.signal(
+bind_context_entered = _signals.signal(
     "quart-sqlalchemy.bind.context.entered",
     doc="""Called when a bind context is entered.
 
@@ -79,7 +77,7 @@ def handler(
     """,
 )
 
-bind_context_exited = sync_signals.signal(
+bind_context_exited = _signals.signal(
     "quart-sqlalchemy.bind.context.exited",
     doc="""Called when a bind context is exited.
 
@@ -95,7 +93,7 @@ def handler(
 )
 
 
-before_framework_extension_initialization = sync_signals.signal(
+before_framework_extension_initialization = _signals.signal(
     "quart-sqlalchemy.framework.extension.initialization.before",
     doc="""Fired before SQLAlchemy.init_app(app) is called.
     
@@ -104,7 +102,7 @@ def handle(sender: QuartSQLAlchemy, app: Quart):
             ...
     """,
 )
-after_framework_extension_initialization = sync_signals.signal(
+after_framework_extension_initialization = _signals.signal(
     "quart-sqlalchemy.framework.extension.initialization.after",
     doc="""Fired after SQLAlchemy.init_app(app) is called.
     

src/quart_sqlalchemy/signals.py

@@ -1,2 +1,5 @@
 from .transaction import AsyncTestTransaction
 from .transaction import TestTransaction
+
+
+__all__ = ["AsyncTestTransaction", "TestTransaction"]