Remove zimports and flake from pre-commit, run black

CaselIT · CaselIT · commit 03ae541dfb48 · 2023-01-18T20:31:55.000+01:00
Fixes: #250
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,22 +8,3 @@ repos:
         types: [file]
         files: \.(py|pyi)$
 
--   repo: https://github.com/sqlalchemyorg/zimports
-    rev: v0.4.0
-    hooks:
-    -   id: zimports
-        types: [file]
-        files: \.(py|pyi)$
-
--   repo: https://github.com/pycqa/flake8
-    rev: 3.9.2
-    hooks:
-    -   id: flake8
-        types: [file]
-        files: \.(py|pyi)$
-        additional_dependencies:
-          - flake8-import-order
-          - flake8-pyi
-
-
-
diff --git a/sqlalchemy-stubs/dialects/postgresql/asyncpg.pyi b/sqlalchemy-stubs/dialects/postgresql/asyncpg.pyi
@@ -148,7 +148,6 @@ class AsyncAdapt_asyncpg_dbapi:
     paramstyle: str = ...
     def __init__(self, asyncpg: Any) -> None: ...
     def connect(self, *arg: Any, **kw: Any): ...
-
     class Error(Exception): ...
     class Warning(Exception): ...
     class InterfaceError(Error): ...
@@ -160,10 +159,8 @@ class AsyncAdapt_asyncpg_dbapi:
     class DataError(DatabaseError): ...
     class NotSupportedError(DatabaseError): ...
     class InternalServerError(InternalError): ...
-
     class InvalidCachedStatementError(NotSupportedError):
         def __init__(self, message: Any) -> None: ...
-
     def Binary(self, value: Any): ...
     STRING: Any = ...
     TIMESTAMP: Any = ...
diff --git a/sqlalchemy-stubs/dialects/postgresql/base.pyi b/sqlalchemy-stubs/dialects/postgresql/base.pyi
@@ -109,7 +109,6 @@ class ENUM(type_api.NativeForEmulated, sqltypes.Enum):
     def drop(
         self, bind: Optional[Any] = ..., checkfirst: bool = ...
     ) -> None: ...
-
     class EnumGenerator(DDLBase):
         checkfirst: Any = ...
         def __init__(
@@ -120,7 +119,6 @@ class ENUM(type_api.NativeForEmulated, sqltypes.Enum):
             **kwargs: Any,
         ) -> None: ...
         def visit_enum(self, enum: Any) -> None: ...
-
     class EnumDropper(DDLBase):
         checkfirst: Any = ...
         def __init__(
diff --git a/sqlalchemy-stubs/dialects/postgresql/hstore.pyi b/sqlalchemy-stubs/dialects/postgresql/hstore.pyi
@@ -8,7 +8,6 @@ class HSTORE(sqltypes.Indexable, sqltypes.Concatenable, sqltypes.TypeEngine):
     hashable: bool = ...
     text_type: Any = ...
     def __init__(self, text_type: Optional[Any] = ...) -> None: ...
-
     class Comparator(
         sqltypes.Indexable.Comparator, sqltypes.Concatenable.Comparator
     ):
diff --git a/sqlalchemy-stubs/dialects/postgresql/json.pyi b/sqlalchemy-stubs/dialects/postgresql/json.pyi
@@ -12,7 +12,6 @@ class JSON(sqltypes.JSON):
     def __init__(
         self, none_as_null: bool = ..., astext_type: Optional[Any] = ...
     ) -> None: ...
-
     class Comparator(sqltypes.JSON.Comparator):
         @property
         def astext(self): ...
diff --git a/sqlalchemy-stubs/engine/base.pyi b/sqlalchemy-stubs/engine/base.pyi
@@ -198,7 +198,6 @@ class Engine(_EngineTypingCommon, Connectable, log.Identified):
     ) -> None: ...
     def execution_options(self, **opt: Any) -> OptionEngine: ...
     def dispose(self) -> None: ...
-
     class _trans_ctx:
         conn: Connection = ...
         transaction: Transaction = ...
@@ -211,7 +210,6 @@ class Engine(_EngineTypingCommon, Connectable, log.Identified):
         ) -> None: ...
         def __enter__(self) -> Connection: ...
         def __exit__(self, type_: Any, value: Any, traceback: Any) -> None: ...
-
     def begin(self, close_with_result: bool = ...) -> _trans_ctx: ...
     def transaction(
         self,
diff --git a/sqlalchemy-stubs/engine/result.pyi b/sqlalchemy-stubs/engine/result.pyi
@@ -65,7 +65,6 @@ class Result(_WithKeys, ResultInternal):
     def __next__(self) -> Row: ...
     if sys.version_info < (3, 0):
         def next(self) -> Row: ...
-
     def partitions(self, size: Optional[int] = ...) -> Iterator[List[Row]]: ...
     def fetchall(self) -> List[Row]: ...
     def fetchone(self) -> Optional[Row]: ...
@@ -95,7 +94,6 @@ class ScalarResult(FilterResult):
     def __next__(self) -> Any: ...
     if sys.version_info < (3, 0):
         def next(self) -> Any: ...
-
     def first(self) -> Optional[Any]: ...
     def one_or_none(self) -> Optional[Any]: ...
     def one(self) -> Any: ...
@@ -121,7 +119,6 @@ class MappingResult(_WithKeys, FilterResult):
     def __next__(self) -> Mapping[Any, Any]: ...
     if sys.version_info < (3, 0):
         def next(self) -> Mapping[Any, Any]: ...
-
     def first(self) -> Optional[Mapping[Any, Any]]: ...
     def one_or_none(self) -> Optional[Mapping[Any, Any]]: ...
     def one(self) -> Mapping[Any, Any]: ...
diff --git a/sqlalchemy-stubs/ext/asyncio/engine.pyi b/sqlalchemy-stubs/ext/asyncio/engine.pyi
@@ -126,7 +126,6 @@ class AsyncConnection(
 class AsyncEngine(_EngineTypingCommon, ProxyComparable, AsyncConnectable):
     @property
     def engine(self: _TEngine) -> _TEngine: ...
-
     class _trans_ctx(StartableContext[AsyncConnection]):
         conn: AsyncConnection = ...
         def __init__(self, conn: AsyncConnection) -> None: ...
diff --git a/sqlalchemy-stubs/future/engine.pyi b/sqlalchemy-stubs/future/engine.pyi
@@ -88,14 +88,12 @@ class Engine(_LegacyEngine):
     def scalar(self, *arg: Any, **kw: Any) -> NoReturn: ...
     def table_names(self, *arg: Any, **kw: Any) -> NoReturn: ...
     def has_table(self, *arg: Any, **kw: Any) -> NoReturn: ...
-
     class _trans_ctx:
         conn: Connection = ...
         def __init__(self, conn: Connection) -> None: ...
         transaction: Transaction = ...
         def __enter__(self) -> Connection: ...
         def __exit__(self, type_: Any, value: Any, traceback: Any) -> None: ...
-
     def begin(self) -> _trans_ctx: ...  # type: ignore[override]
     def connect(self) -> Connection: ...  # type: ignore[override]
 
diff --git a/sqlalchemy-stubs/orm/descriptor_props.pyi b/sqlalchemy-stubs/orm/descriptor_props.pyi
@@ -37,14 +37,12 @@ class CompositeProperty(DescriptorProperty[_T]):
     @property
     def columns(self): ...
     def get_history(self, state: Any, dict_: Any, passive: Any = ...): ...
-
     class CompositeBundle(orm_util.Bundle):
         property: Any = ...
         def __init__(self, property_: Any, expr: Any) -> None: ...
         def create_row_processor(
             self, query: Any, procs: Any, labels: Any
         ): ...
-
     class Comparator(PropComparator):
         __hash__: Any = ...
         @util.memoized_property
diff --git a/sqlalchemy-stubs/orm/events.pyi b/sqlalchemy-stubs/orm/events.pyi
@@ -39,17 +39,14 @@ class InstanceEvents(event.Events):
 class _EventsHold(event.RefCollection):
     class_: Any = ...
     def __init__(self, class_: Any) -> None: ...
-
     class HoldEvents: ...
-
     def remove(self, event_key: Any) -> None: ...
     @classmethod
     def populate(cls, class_: Any, subject: Any) -> None: ...
 
 class _InstanceEventsHold(_EventsHold):
     all_holds: Any = ...
     def resolve(self, class_: Any): ...
-
     class HoldInstanceEvents(_EventsHold.HoldEvents, InstanceEvents): ...
     dispatch: Any = ...
 
@@ -81,7 +78,6 @@ class MapperEvents(event.Events):
 class _MapperEventsHold(_EventsHold):
     all_holds: Any = ...
     def resolve(self, class_: Any): ...
-
     class HoldMapperEvents(_EventsHold.HoldEvents, MapperEvents): ...
     dispatch: Any = ...
 
diff --git a/sqlalchemy-stubs/orm/persistence.pyi b/sqlalchemy-stubs/orm/persistence.pyi
@@ -32,7 +32,6 @@ def delete_obj(base_mapper: Any, states: Any, uowtransaction: Any) -> None: ...
 
 class BulkUDCompileState(CompileState):
     class default_update_options(Options): ...
-
     @classmethod
     def orm_pre_session_exec(
         cls,
diff --git a/sqlalchemy-stubs/orm/properties.pyi b/sqlalchemy-stubs/orm/properties.pyi
@@ -43,7 +43,6 @@ class ColumnProperty(StrategizedProperty):
         _recursive: Any,
         _resolve_conflict_map: Any,
     ) -> None: ...
-
     class Comparator(util.MemoizedSlots, PropComparator):
         def _memoized_method___clause_element__(self): ...
         def operate(self, op: Any, *other: Any, **kwargs: Any): ...
diff --git a/sqlalchemy-stubs/orm/relationships.pyi b/sqlalchemy-stubs/orm/relationships.pyi
@@ -133,7 +133,6 @@ class RelationshipProperty(StrategizedProperty[_T]):
         sync_backref: Optional[Any] = ...,
     ) -> None: ...
     def instrument_class(self, mapper: Any) -> None: ...
-
     class Comparator(PropComparator):
         prop: Any = ...
         def __init__(
@@ -161,7 +160,6 @@ class RelationshipProperty(StrategizedProperty[_T]):
         def __ne__(self, other: Any) -> Any: ...
         @util.memoized_property
         def property(self): ...
-
     def merge(
         self,
         session: Any,
diff --git a/sqlalchemy-stubs/orm/strategies.pyi b/sqlalchemy-stubs/orm/strategies.pyi
@@ -215,7 +215,6 @@ class SubqueryLoader(PostLoader):
     join_depth: Any = ...
     def __init__(self, parent: Any, strategy_key: Any) -> None: ...
     def init_class_attribute(self, mapper: Any) -> None: ...
-
     class _SubqCollections:
         session: Any = ...
         execution_options: Any = ...
@@ -225,7 +224,6 @@ class SubqueryLoader(PostLoader):
         def __init__(self, context: Any, subq: Any) -> None: ...
         def get(self, key: Any, default: Any): ...
         def loader(self, state: Any, dict_: Any, row: Any) -> None: ...
-
     def create_row_processor(
         self,
         context: Any,
diff --git a/sqlalchemy-stubs/sql/sqltypes.pyi b/sqlalchemy-stubs/sql/sqltypes.pyi
@@ -253,7 +253,6 @@ class Enum(Emulated, String, SchemaType):
     def sort_key_function(self) -> util._SortKeyFunction: ...  # type: ignore[override]
     @property
     def native(self) -> Any: ...
-
     class Comparator(String.Comparator["Enum"]): ...
     comparator_factory: Type[Comparator] = ...  # type: ignore[assignment]
     def as_generic(self: _EN, allow_nulltype: bool = ...) -> _EN: ...
@@ -345,7 +344,6 @@ class JSON(
     none_as_null: bool = ...
     should_evaluate_none: bool = ...
     def __init__(self, none_as_null: bool = ...) -> None: ...
-
     class JSONElementType(TypeEngine[Union[int, util.text_type]]):
         def string_bind_processor(
             self, dialect: Dialect
@@ -359,12 +357,10 @@ class JSON(
         def literal_processor(
             self, dialect: Dialect
         ) -> _LiteralProcessor[Union[int, util.text_type]]: ...
-
     class JSONIndexType(JSONElementType): ...
     class JSONIntIndexType(JSONIndexType): ...
     class JSONStrIndexType(JSONIndexType): ...
     class JSONPathType(JSONElementType): ...
-
     class Comparator(
         Indexable.Comparator["JSON"], Concatenable.Comparator["JSON"]
     ):
@@ -459,7 +455,6 @@ class NullType(TypeEngine[None]):
     def literal_processor(
         self, dialect: Dialect
     ) -> _LiteralProcessor[None]: ...
-
     class Comparator(TypeEngine.Comparator["NullType"]): ...
     comparator_factory: Type[Comparator] = ...  # type: ignore[assignment]
 
diff --git a/sqlalchemy-stubs/sql/type_api.pyi b/sqlalchemy-stubs/sql/type_api.pyi
@@ -56,7 +56,6 @@ class _ResultProcessor(Protocol[_T_co]):
 
 class TypeEngine(Traversible, Generic[_T]):
     __visit_name__: ClassVar[str] = ...
-
     class Comparator(operators.ColumnOperators, Generic[_TE]):
         default_comparator: Any = ...
         def __clause_element__(self) -> ClauseElement: ...
@@ -96,7 +95,9 @@ class TypeEngine(Traversible, Generic[_T]):
     @property
     def python_type(self) -> Type[_T]: ...
     def with_variant(
-        self, type_: Union[Type[TypeEngine[_U]], TypeEngine[_U]], dialect_name: str
+        self,
+        type_: Union[Type[TypeEngine[_U]], TypeEngine[_U]],
+        dialect_name: str,
     ) -> Variant[_U]: ...
     def as_generic(self, allow_nulltype: bool = ...) -> TypeEngine[Any]: ...
     def dialect_impl(self, dialect: Dialect) -> Type[Any]: ...
@@ -129,15 +130,13 @@ class TypeDecorator(SchemaEventTarget, TypeEngine[_T]):
     cache_ok: ClassVar[Optional[bool]] = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     coerce_to_is_types: Tuple[Type[Any], ...] = ...
-
     class Comparator(TypeEngine.Comparator[_TE]):
         def operate(
             self, op: Any, *other: Any, **kwargs: Any
         ) -> ClauseElement: ...
         def reverse_operate(
             self, op: Any, other: Any, **kwargs: Any
         ) -> ClauseElement: ...
-
     @property
     def comparator_factory(self) -> Type[Comparator[TypeEngine[_T]]]: ...  # type: ignore[override]
     def type_engine(self, dialect: Dialect) -> TypeEngine[Any]: ...
@@ -177,7 +176,9 @@ class Variant(TypeDecorator[_T]):
     ) -> Union[_VT, TypeEngine[Any]]: ...
     def load_dialect_impl(self, dialect: Dialect) -> TypeEngine[Any]: ...
     def with_variant(
-        self, type_: Union[Type[TypeEngine[_U]], TypeEngine[_U]], dialect_name: str
+        self,
+        type_: Union[Type[TypeEngine[_U]], TypeEngine[_U]],
+        dialect_name: str,
     ) -> Variant[_U]: ...
     @property
     def comparator_factory(self) -> Type[Any]: ...  # type: ignore[override]
diff --git a/sqlalchemy-stubs/sql/util.pyi b/sqlalchemy-stubs/sql/util.pyi
@@ -136,13 +136,11 @@ class ColumnAdapter(ClauseAdapter):
         allow_label_resolve: bool = ...,
         anonymize_labels: bool = ...,
     ) -> None: ...
-
     class _IncludeExcludeMapping:
         parent: Any = ...
         columns: Any = ...
         def __init__(self, parent: Any, columns: Any) -> None: ...
         def __getitem__(self, key: Any) -> Any: ...
-
     def wrap(self: _COLA, adapter: Any) -> _COLA: ...
     def traverse(self, obj: Any) -> Any: ...
     def adapt_clause(self, obj: Any) -> Any: ...
diff --git a/sqlalchemy-stubs/util/_collections.pyi b/sqlalchemy-stubs/util/_collections.pyi
@@ -171,7 +171,6 @@ else:
             def itervalues(self) -> Iterator[_VT]: ...
             def iterkeys(self) -> Iterator[_KT]: ...
             def iteritems(self) -> Iterator[Tuple[_KT, _VT]]: ...
-
         def __setitem__(self, key: _KT, obj: _VT) -> None: ...
         def __delitem__(self, key: _KT) -> None: ...
         @overload
diff --git a/sqlalchemy-stubs/util/_concurrency_py3k.pyi b/sqlalchemy-stubs/util/_concurrency_py3k.pyi
@@ -19,7 +19,6 @@ if sys.version_info >= (3, 0):
         _require_await: bool = ...,
         **kwargs: Any,
     ) -> _T: ...
-
     class AsyncAdaptedLock:
         @util.memoized_property
         def mutex(self) -> Any: ...
diff --git a/sqlalchemy-stubs/util/compat.pyi b/sqlalchemy-stubs/util/compat.pyi
@@ -124,7 +124,6 @@ else:
     from urlparse import parse_qsl as parse_qsl  # noqa
 
     from abc import ABCMeta
-
     class ABC(object):
         __metaclass__ = ABCMeta
     import pickle as pickle  # noqa
@@ -209,7 +208,6 @@ else:
     from datetime import datetime
     from datetime import timedelta
     from datetime import tzinfo
-
     class timezone(tzinfo):
         def __init__(self, offset: timedelta) -> None: ...
         def __eq__(self, other: Any) -> Any: ...
diff --git a/sqlalchemy-stubs/util/langhelpers.pyi b/sqlalchemy-stubs/util/langhelpers.pyi
@@ -142,7 +142,6 @@ class HasMemoized:
         def __get__(self: _MA, obj: None, cls: Any) -> _MA: ...
         @overload
         def __get__(self, obj: Any, cls: Any) -> _T: ...
-
     @classmethod
     def memoized_instancemethod(cls, fn: Any) -> Any: ...
 
