Skip to content

Commit 7c1d933

Browse files
committed
Add declarative_mixin
In support of sqlalchemy/sqlalchemy#6147
1 parent 69ffb51 commit 7c1d933

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = sqlalchemy2-stubs
3-
version = 0.0.1a4
3+
version = 0.0.1a5
44
description = Typing Stubs for SQLAlchemy 1.4
55
long_description = file: README.rst
66
long_description_content_type = text/x-rst

sqlalchemy-stubs/orm/__init__.pyi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ from .attributes import QueryableAttribute as QueryableAttribute
1010
from .context import QueryContext as QueryContext
1111
from .decl_api import as_declarative as as_declarative
1212
from .decl_api import declarative_base as declarative_base
13+
from .decl_api import declarative_mixin as declarative_mixin
1314
from .decl_api import declared_attr as declared_attr
1415
from .decl_api import has_inherited_table as has_inherited_table
1516
from .decl_api import registry as registry

sqlalchemy-stubs/orm/decl_api.pyi

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,6 @@ from ..util import hybridproperty as hybridproperty
2525
_T = TypeVar("_T")
2626

2727
def has_inherited_table(cls: type) -> bool: ...
28-
29-
class DeclarativeMeta(type):
30-
def __init__(
31-
cls, classname: Any, bases: Any, dict_: Any, **kw: Any
32-
) -> None: ...
33-
def __setattr__(cls, key: Any, value: Any) -> None: ...
34-
def __delattr__(cls, key: Any) -> None: ...
35-
metadata: MetaData
36-
registry: _registry # Avoid circural reference
37-
3828
def synonym_for(name: Any, map_column: bool = ...): ...
3929

4030
class declared_attr(interfaces._MappedAttribute, property, Generic[_T]):
@@ -50,6 +40,7 @@ class _stateful_declared_attr(declared_attr):
5040
def __init__(self, **kw: Any) -> None: ...
5141
def __call__(self, fn: Any): ...
5242

43+
def declarative_mixin(cls: type) -> type: ...
5344
def declarative_base(
5445
bind: Optional[
5546
Any
@@ -98,4 +89,13 @@ class registry:
9889

9990
_registry = registry
10091

92+
class DeclarativeMeta(type):
93+
def __init__(
94+
cls, classname: Any, bases: Any, dict_: Any, **kw: Any
95+
) -> None: ...
96+
def __setattr__(cls, key: Any, value: Any) -> None: ...
97+
def __delattr__(cls, key: Any) -> None: ...
98+
metadata: MetaData
99+
registry: _registry # Avoid circural reference
100+
101101
def as_declarative(**kw: Any) -> Callable[[Type[_T]], Type[_T]]: ...

0 commit comments

Comments
 (0)