diff --git a/CHANGELOG.md b/CHANGELOG.md index bb3a6c9..81c2490 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.12.1 + ++ Fix import failure for `AsyncSelectPagination` (module `sqlalchemy`) + ## 0.12.0 "The Color Update" * Moved `AsyncSelectPagination` to submodule `sqlalchemy.quart`. If you need to use it, specify `suou[quart_sqlalchemy]` in requirements. diff --git a/docs/api.rst b/docs/api.rst index 72b76e8..14bf6ec 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -29,6 +29,7 @@ API suou.lex suou.luck suou.markdown + suou.mat suou.migrate suou.peewee suou.quart diff --git a/docs/color.rst b/docs/color.rst index 7d24102..8fd781c 100644 --- a/docs/color.rst +++ b/docs/color.rst @@ -19,15 +19,28 @@ Web colors ---------- .. autoclass:: RGBColor + + .. automethods:: .. autoclass:: WebColor -.. auto +.. autoclass:: LinearRGBColor + + .. automethods:: .. autoclass:: XYZColor + .. automethods:: -.. autoclass:: OKLabColor \ No newline at end of file + +.. autoclass:: OKLabColor + + .. automethods:: + + +.. autoclass:: OKLCHColor + + .. automethods:: \ No newline at end of file diff --git a/docs/generated/suou.color.rst b/docs/generated/suou.color.rst index 339e4ed..d7da1c2 100644 --- a/docs/generated/suou.color.rst +++ b/docs/generated/suou.color.rst @@ -9,7 +9,10 @@ .. autosummary:: Chalk + LinearRGBColor + OKLCHColor + OKLabColor RGBColor - SRGBColor WebColor + XYZColor \ No newline at end of file diff --git a/docs/generated/suou.sqlalchemy.asyncio.rst b/docs/generated/suou.sqlalchemy.asyncio.rst index 872ac14..d67d664 100644 --- a/docs/generated/suou.sqlalchemy.asyncio.rst +++ b/docs/generated/suou.sqlalchemy.asyncio.rst @@ -1,4 +1,4 @@ -suou.sqlalchemy.asyncio +suou.sqlalchemy.asyncio ======================= .. automodule:: suou.sqlalchemy.asyncio @@ -14,7 +14,6 @@ suou.sqlalchemy.asyncio .. autosummary:: - AsyncSelectPagination SQLAlchemy SessionWrapper \ No newline at end of file diff --git a/src/suou/__init__.py b/src/suou/__init__.py index 60f8b7b..709b41d 100644 --- a/src/suou/__init__.py +++ b/src/suou/__init__.py @@ -38,7 +38,7 @@ from .http import WantsContentType from .color import OKLabColor, chalk, WebColor, RGBColor, LinearRGBColor, XYZColor, OKLCHColor from .mat import Matrix -__version__ = "0.12.0" +__version__ = "0.12.1" __all__ = ( 'ConfigOptions', 'ConfigParserConfigSource', 'ConfigSource', 'ConfigValue', diff --git a/src/suou/sqlalchemy/__init__.py b/src/suou/sqlalchemy/__init__.py index c3e9856..889d7ad 100644 --- a/src/suou/sqlalchemy/__init__.py +++ b/src/suou/sqlalchemy/__init__.py @@ -23,6 +23,7 @@ import warnings from sqlalchemy import BigInteger, Boolean, CheckConstraint, Date, Dialect, ForeignKey, LargeBinary, Column, MetaData, SmallInteger, String, create_engine, select, text from sqlalchemy.orm import DeclarativeBase, InstrumentedAttribute, Relationship, Session, declarative_base as _declarative_base, relationship from sqlalchemy.types import TypeEngine +from suou.glue import FakeModule from ..snowflake import SnowflakeGen from ..itertools import kwargs_prefix, makelist @@ -158,12 +159,18 @@ def require_auth_base(cls: type[DeclarativeBase], *, src: AuthSrc, column: str | return decorator -from .asyncio import SQLAlchemy, AsyncSelectPagination, async_query +from .asyncio import SQLAlchemy, async_query from .orm import ( id_column, snowflake_column, match_column, match_constraint, bool_column, declarative_base, parent_children, author_pair, age_pair, bound_fk, unbound_fk, want_column, a_relationship, BitSelector, secret_column, username_column ) +try: + from .quart import AsyncSelectPagination + AsyncSelectPagination = deprecated('import AsyncSelectPagination from suou.sqlalchemy.quart instead')(AsyncSelectPagination) +except ImportError: + pass + # Optional dependency: do not import into __init__.py __all__ = ( 'IdType', 'id_column', 'snowflake_column', 'entity_base', 'declarative_base', 'token_signer',