dev

Author: zzzeek

.pre-commit-config.yaml

@@ -1,13 +1,6 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
--   repo: https://github.com/sqlalchemyorg/zimports
-    rev: 0.2.2
-    hooks:
-    -   id: zimports
-        types: [file]
-        files: \.(py|pyi)$
-
 -   repo: https://github.com/python/black
     rev: 20.8b1
     hooks:

setup.cfg

@@ -47,6 +47,7 @@ ignore =
     E203,E305,E711,E712,E721,E722,E741,
     N801,N802,N806,
     RST304,RST303,RST299,RST399,
+    F401,
     W503,W504
 exclude = .venv,.git,.tox,dist,doc,*egg,build
 import-order-style = google

sqlalchemy-stubs/orm/attributes.pyi

@@ -2,6 +2,7 @@ from collections import namedtuple
 from typing import Any
 from typing import Generic
 from typing import Optional
+from typing import overload
 from typing import Type
 from typing import TypeVar
 
@@ -83,12 +84,11 @@ class QueryableAttribute(
     def property(self): ...
 
 _T = TypeVar("_T")
-_Generic_T = Generic[_T]
 
 class Mapped(QueryableAttribute, Generic[_T]):
     def __init__(self, type: Type[_T]) -> None: ...
     @overload
-    def __get__(self, instance: None, owner: Any) -> Mapped[_T]: ...
+    def __get__(self, instance: None, owner: Any) -> "Mapped"[_T]: ...
     @overload
     def __get__(self, instance: object, owner: Any) -> _T: ...
     def __set__(self, instance: Any, value: _T) -> None: ...
@@ -312,8 +312,8 @@ class CollectionAttributeImpl(AttributeImpl):
         value: Any,
         initiator: Optional[Any] = ...,
         passive: Any = ...,
+        check_old: Optional[Any] = ...,
         pop: bool = ...,
-        _adapt: bool = ...,
     ) -> None: ...
     def set_committed_value(self, state: Any, dict_: Any, value: Any): ...
     def get_collection(

sqlalchemy-stubs/orm/interfaces.pyi

@@ -3,11 +3,12 @@ from typing import Generic
 from typing import Optional
 from typing import TypeVar
 
-from .base import _MappedAttribute
+from .base import _MappedAttribute as _MappedAttribute
 from .base import EXT_CONTINUE as EXT_CONTINUE
 from .base import EXT_SKIP as EXT_SKIP
 from .base import EXT_STOP as EXT_STOP
-from .base import InspectionAttr
+from .base import InspectionAttr as InspectionAttr
+from .base import InspectionAttrInfo as InspectionAttrInfo  # noqa
 from .base import MANYTOMANY as MANYTOMANY
 from .base import MANYTOONE as MANYTOONE
 from .base import NOT_EXTENSION as NOT_EXTENSION
@@ -58,9 +59,10 @@ class MapperProperty(
         self,
         type_: Any,
         state: Any,
-        visited_instances: Optional[Any] = ...,
+        dict_: Any,
+        visited_states: Any,
         halt_on: Optional[Any] = ...,
-    ): ...
+    ) -> None: ...
     parent: Any = ...
     def set_parent(self, parent: Any, init: Any) -> None: ...
     def instrument_class(self, mapper: Any) -> None: ...

sqlalchemy-stubs/orm/relationships.pyi

@@ -13,6 +13,7 @@ from .interfaces import PropComparator as PropComparator
 from .interfaces import StrategizedProperty as StrategizedProperty
 from .util import AliasedInsp as AliasedInsp
 from .util import CascadeOptions as CascadeOptions
+from .mapper import Mapper
 from .. import log as log
 from .. import schema as schema
 from .. import sql as sql
@@ -152,7 +153,7 @@ class RelationshipProperty(StrategizedProperty[_T]):
         visited_states: Any,
         halt_on: Optional[Any] = ...,
     ) -> None: ...
-    def entity(self) -> Union[AliasedInsp, mapperlib.Mapper]: ...
+    def entity(self) -> Union[AliasedInsp, Mapper]: ...
     def mapper(self): ...
     def do_init(self) -> None: ...
     @property

sqlalchemy-stubs/orm/session.pyi

@@ -1,7 +1,5 @@
-from typing import Any
-from typing import Optional
-
 from .. import util
+from typing import Any, Optional
 
 class _SessionClassMethods:
     @classmethod
@@ -247,3 +245,8 @@ class sessionmaker(_SessionClassMethods):
     def begin(self): ...
     def __call__(self, **local_kw: Any): ...
     def configure(self, **new_kw: Any) -> None: ...
+
+def close_all_sessions() -> Any: ...
+def make_transient(instance: object) -> Any: ...
+def make_transient_to_detached(instance: object) -> Any: ...
+def object_session(instance: object) -> Any: ...