Fix formatting

bryanforbes · bryanforbes · commit 3d0ab5c1588a · 2021-03-23T19:15:19.000-05:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,4 +8,22 @@ repos:
         types: [file]
         files: \.(py|pyi)$
 
+-   repo: https://github.com/sqlalchemyorg/zimports
+    rev: 0.3.0
+    hooks:
+    -   id: zimports
+        types: [file]
+        files: \.(py|pyi)$
+
+-   repo: https://github.com/pycqa/flake8
+    rev: 3.8.4
+    hooks:
+    -   id: flake8
+        types: [file]
+        files: \.(py|pyi)$
+        additional_dependencies:
+          - flake8-import-order
+          - flake8-pyi
+
+
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,3 @@
 [tool.black]
 line-length = 79
-target-version = ['py37']
+target-version = ['py36']
diff --git a/setup.cfg b/setup.cfg
@@ -28,7 +28,7 @@ project_urls =
 python_requires = >=3.6
 
 install_requires =
-    mypy>=0.790
+    mypy>=0.800
     typing-extensions>=3.7.4
 
 [options.data_files]
@@ -42,13 +42,12 @@ show-source = false
 enable-extensions = G
 
 ignore =
-    A003,
-    D,
     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
 application-import-names = sqlalchemy,test,sqlalchemy-stubs
+per-file-ignores =
+    *.pyi: F403, F405, F811, E127, E128, E266, E301, E302, E501, E701, E704, E741, B303
diff --git a/sqlalchemy-stubs/__init__.pyi b/sqlalchemy-stubs/__init__.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from .engine import create_engine as create_engine
 from .engine import create_mock_engine as create_mock_engine
 from .engine import engine_from_config as engine_from_config
diff --git a/sqlalchemy-stubs/dialects/mssql/provision.pyi b/sqlalchemy-stubs/dialects/mssql/provision.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from sqlalchemy import inspect as inspect
 from sqlalchemy import Integer as Integer
 from ... import create_engine as create_engine
diff --git a/sqlalchemy-stubs/dialects/mysql/provision.pyi b/sqlalchemy-stubs/dialects/mysql/provision.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from ... import exc as exc
 from ...testing.provision import configure_follower as configure_follower
 from ...testing.provision import create_db as create_db
diff --git a/sqlalchemy-stubs/dialects/oracle/provision.pyi b/sqlalchemy-stubs/dialects/oracle/provision.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from ... import create_engine as create_engine
 from ... import exc as exc
 from ...testing.provision import configure_follower as configure_follower
diff --git a/sqlalchemy-stubs/dialects/postgresql/ext.pyi b/sqlalchemy-stubs/dialects/postgresql/ext.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from typing import Any
 from typing import Optional
 
@@ -10,6 +11,7 @@ from ...sql import functions as functions
 from ...sql import roles as roles
 from ...sql import schema as schema
 from ...sql.schema import ColumnCollectionConstraint as ColumnCollectionConstraint
+# fmt: on
 
 class aggregate_order_by(expression.ColumnElement):
     __visit_name__: str = ...
diff --git a/sqlalchemy-stubs/dialects/postgresql/provision.pyi b/sqlalchemy-stubs/dialects/postgresql/provision.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from ... import exc as exc
 from ... import inspect as inspect
 from ... import text as text
diff --git a/sqlalchemy-stubs/dialects/sqlite/provision.pyi b/sqlalchemy-stubs/dialects/sqlite/provision.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from ...testing.provision import create_db as create_db
 from ...testing.provision import drop_db as drop_db
 from ...testing.provision import follower_url_from_main as follower_url_from_main
diff --git a/sqlalchemy-stubs/dialects/sybase/mxodbc.pyi b/sqlalchemy-stubs/dialects/sybase/mxodbc.pyi
@@ -1,8 +1,10 @@
+# fmt: off
 from typing import Any
 
 from sqlalchemy.connectors.mxodbc import MxODBCConnector as MxODBCConnector
 from sqlalchemy.dialects.sybase.base import SybaseDialect as SybaseDialect
 from sqlalchemy.dialects.sybase.base import SybaseExecutionContext as SybaseExecutionContext
+# fmt: on
 
 class SybaseExecutionContext_mxodbc(SybaseExecutionContext): ...
 
diff --git a/sqlalchemy-stubs/dialects/sybase/pyodbc.pyi b/sqlalchemy-stubs/dialects/sybase/pyodbc.pyi
@@ -1,10 +1,12 @@
+# fmt: off
 from typing import Any
 
 from sqlalchemy import processors as processors
 from sqlalchemy import types as sqltypes
 from sqlalchemy.connectors.pyodbc import PyODBCConnector as PyODBCConnector
 from sqlalchemy.dialects.sybase.base import SybaseDialect as SybaseDialect
 from sqlalchemy.dialects.sybase.base import SybaseExecutionContext as SybaseExecutionContext
+# fmt: on
 
 class _SybNumeric_pyodbc(sqltypes.Numeric):
     def bind_processor(self, dialect: Any): ...
diff --git a/sqlalchemy-stubs/dialects/sybase/pysybase.pyi b/sqlalchemy-stubs/dialects/sybase/pysybase.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from typing import Any
 from typing import Optional
 
@@ -6,6 +7,7 @@ from sqlalchemy import types as sqltypes
 from sqlalchemy.dialects.sybase.base import SybaseDialect as SybaseDialect
 from sqlalchemy.dialects.sybase.base import SybaseExecutionContext as SybaseExecutionContext
 from sqlalchemy.dialects.sybase.base import SybaseSQLCompiler as SybaseSQLCompiler
+# fmt: on
 
 class _SybNumeric(sqltypes.Numeric):
     def result_processor(self, dialect: Any, type_: Any): ...
diff --git a/sqlalchemy-stubs/engine/__init__.pyi b/sqlalchemy-stubs/engine/__init__.pyi
@@ -1,52 +1,42 @@
-from . import events as events, util as util
-from ..sql import ddl as ddl
-from .base import (
-    Connection as Connection,
-    Engine as Engine,
-    NestedTransaction as NestedTransaction,
-    RootTransaction as RootTransaction,
-    Transaction as Transaction,
-    TwoPhaseTransaction as TwoPhaseTransaction,
-)
-from .create import (
-    create_engine as create_engine,
-    engine_from_config as engine_from_config,
-)
-from .cursor import (
-    BaseCursorResult as BaseCursorResult,
-    BufferedColumnResultProxy as BufferedColumnResultProxy,
-    BufferedColumnRow as BufferedColumnRow,
-    BufferedRowResultProxy as BufferedRowResultProxy,
-    CursorResult as CursorResult,
-    FullyBufferedResultProxy as FullyBufferedResultProxy,
-    LegacyCursorResult as LegacyCursorResult,
-)
-from .interfaces import (
-    Compiled as Compiled,
-    Connectable as Connectable,
-    CreateEnginePlugin as CreateEnginePlugin,
-    Dialect as Dialect,
-    ExceptionContext as ExceptionContext,
-    ExecutionContext as ExecutionContext,
-    TypeCompiler as TypeCompiler,
-)
+from . import events as events
+from . import util as util
+from .base import Connection as Connection
+from .base import Engine as Engine
+from .base import NestedTransaction as NestedTransaction
+from .base import RootTransaction as RootTransaction
+from .base import Transaction as Transaction
+from .base import TwoPhaseTransaction as TwoPhaseTransaction
+from .create import create_engine as create_engine
+from .create import engine_from_config as engine_from_config
+from .cursor import BaseCursorResult as BaseCursorResult
+from .cursor import BufferedColumnResultProxy as BufferedColumnResultProxy
+from .cursor import BufferedColumnRow as BufferedColumnRow
+from .cursor import BufferedRowResultProxy as BufferedRowResultProxy
+from .cursor import CursorResult as CursorResult
+from .cursor import FullyBufferedResultProxy as FullyBufferedResultProxy
+from .cursor import LegacyCursorResult as LegacyCursorResult
+from .interfaces import Compiled as Compiled
+from .interfaces import Connectable as Connectable
+from .interfaces import CreateEnginePlugin as CreateEnginePlugin
+from .interfaces import Dialect as Dialect
+from .interfaces import ExceptionContext as ExceptionContext
+from .interfaces import ExecutionContext as ExecutionContext
+from .interfaces import TypeCompiler as TypeCompiler
 from .mock import create_mock_engine as create_mock_engine
 from .reflection import Inspector as Inspector
-from .result import (
-    ChunkedIteratorResult as ChunkedIteratorResult,
-    FrozenResult as FrozenResult,
-    IteratorResult as IteratorResult,
-    MappingResult as MappingResult,
-    MergedResult as MergedResult,
-    Result as Result,
-    ScalarResult as ScalarResult,
-    result_tuple as result_tuple,
-)
-from .row import (
-    BaseRow as BaseRow,
-    LegacyRow as LegacyRow,
-    Row as Row,
-    RowMapping as RowMapping,
-)
-from .url import URL as URL, make_url as make_url
+from .result import ChunkedIteratorResult as ChunkedIteratorResult
+from .result import FrozenResult as FrozenResult
+from .result import IteratorResult as IteratorResult
+from .result import MappingResult as MappingResult
+from .result import MergedResult as MergedResult
+from .result import Result as Result
+from .result import result_tuple as result_tuple
+from .result import ScalarResult as ScalarResult
+from .row import BaseRow as BaseRow
+from .row import LegacyRow as LegacyRow
+from .row import Row as Row
+from .row import RowMapping as RowMapping
+from .url import make_url as make_url
+from .url import URL as URL
 from .util import connection_memoize as connection_memoize
+from ..sql import ddl as ddl
diff --git a/sqlalchemy-stubs/engine/row.pyi b/sqlalchemy-stubs/engine/row.pyi
@@ -1,10 +1,12 @@
+# fmt: off
 import abc
 from typing import Any
 
 from sqlalchemy.cresultproxy import BaseRow as BaseRow
 from sqlalchemy.cresultproxy import safe_rowproxy_reconstructor as safe_rowproxy_reconstructor
 from .. import util as util
 from ..util.compat import collections_abc as collections_abc
+# fmt: on
 
 MD_INDEX: int
 
diff --git a/sqlalchemy-stubs/ext/asyncio/session.pyi b/sqlalchemy-stubs/ext/asyncio/session.pyi
@@ -13,7 +13,7 @@ from ...orm import Session as Session
 from ...sql import Executable as Executable
 from ...util.concurrency import greenlet_spawn as greenlet_spawn
 
-T = TypeVar("T")
+_T = TypeVar("_T")
 
 class AsyncSession:
     dispatch: Any = ...
@@ -33,8 +33,8 @@ class AsyncSession:
         with_for_update: Optional[Any] = ...,
     ): ...
     async def run_sync(
-        self, fn: Callable[..., T], *arg: Any, **kw: Any
-    ) -> T: ...
+        self, fn: Callable[..., _T], *arg: Any, **kw: Any
+    ) -> _T: ...
     async def execute(
         self,
         statement: Executable,
diff --git a/sqlalchemy-stubs/ext/instrumentation.pyi b/sqlalchemy-stubs/ext/instrumentation.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from typing import Any
 from typing import Optional
 
@@ -6,6 +7,7 @@ from ..orm import attributes as attributes
 from ..orm import collections as collections
 from ..orm.instrumentation import ClassManager as ClassManager
 from ..orm.instrumentation import InstrumentationFactory as InstrumentationFactory
+# fmt: on
 
 INSTRUMENTATION_MANAGER: str
 
diff --git a/sqlalchemy-stubs/orm/__init__.pyi b/sqlalchemy-stubs/orm/__init__.pyi
@@ -35,7 +35,6 @@ from .interfaces import MANYTOONE as MANYTOONE
 from .interfaces import MapperProperty as MapperProperty
 from .interfaces import NOT_EXTENSION as NOT_EXTENSION
 from .interfaces import ONETOMANY as ONETOMANY
-from .interfaces import ORMOption
 from .interfaces import PropComparator as PropComparator
 from .loading import merge_frozen_result as merge_frozen_result
 from .loading import merge_result as merge_result
@@ -78,16 +77,8 @@ from .util import with_polymorphic as with_polymorphic
 from ..util.langhelpers import public_factory as public_factory
 
 def create_session(bind: Optional[Any] = ..., **kwargs: Any) -> Session: ...
-def with_loader_criteria(
-    entity_or_base: Any,
-    where_criteria: Any,
-    loader_only: Optional[bool],
-    include_aliases: Optional[bool],
-    propagate_to_loaders: Optional[bool],
-    track_closure_variables: Optional[bool],
-):
-    ORMOption
 
+with_loader_criteria = LoaderCriteriaOption
 relationship = RelationshipProperty
 
 def relation(*arg: Any, **kw: Any) -> RelationshipProperty: ...
diff --git a/sqlalchemy-stubs/orm/base.pyi b/sqlalchemy-stubs/orm/base.pyi
@@ -9,7 +9,7 @@ PASSIVE_CLASS_MISMATCH: Any
 ATTR_WAS_SET: Any
 ATTR_EMPTY: Any
 NO_VALUE: Any
-NEVER_SET = NO_VALUE
+NEVER_SET: Any
 NO_CHANGE: Any
 CALLABLES_OK: Any
 SQL_OK: Any
diff --git a/sqlalchemy-stubs/orm/context.pyi b/sqlalchemy-stubs/orm/context.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from typing import Any
 from typing import Optional
 
@@ -26,6 +27,7 @@ from ..sql.selectable import LABEL_STYLE_TABLENAME_PLUS_COL as LABEL_STYLE_TABLE
 from ..sql.selectable import SelectState as SelectState
 from ..sql.visitors import ExtendedInternalTraversal as ExtendedInternalTraversal
 from ..sql.visitors import InternalTraversal as InternalTraversal
+# fmt: on
 
 LABEL_STYLE_LEGACY_ORM: Any
 
diff --git a/sqlalchemy-stubs/orm/loading.pyi b/sqlalchemy-stubs/orm/loading.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from typing import Any
 from typing import Optional
 
@@ -12,6 +13,7 @@ from ..engine.result import ChunkedIteratorResult as ChunkedIteratorResult
 from ..engine.result import FrozenResult as FrozenResult
 from ..engine.result import SimpleResultMetaData as SimpleResultMetaData
 from ..sql.selectable import LABEL_STYLE_TABLENAME_PLUS_COL as LABEL_STYLE_TABLENAME_PLUS_COL
+# fmt: on
 
 def instances(cursor: Any, context: Any): ...
 def merge_frozen_result(
diff --git a/sqlalchemy-stubs/orm/mapper.pyi b/sqlalchemy-stubs/orm/mapper.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from typing import Any
 from typing import Optional
 
@@ -27,6 +28,7 @@ from ..sql import roles as roles
 from ..sql import visitors as visitors
 from ..sql.selectable import LABEL_STYLE_TABLENAME_PLUS_COL as LABEL_STYLE_TABLENAME_PLUS_COL
 from ..util import HasMemoized as HasMemoized
+# fmt: on
 
 NO_ATTRIBUTE: Any
 
diff --git a/sqlalchemy-stubs/orm/persistence.pyi b/sqlalchemy-stubs/orm/persistence.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from typing import Any
 
 from . import attributes as attributes
@@ -19,6 +20,7 @@ from ..sql.dml import DeleteDMLState as DeleteDMLState
 from ..sql.dml import UpdateDMLState as UpdateDMLState
 from ..sql.elements import BooleanClauseList as BooleanClauseList
 from ..sql.selectable import LABEL_STYLE_TABLENAME_PLUS_COL as LABEL_STYLE_TABLENAME_PLUS_COL
+# fmt: on
 
 def save_obj(
     base_mapper: Any, states: Any, uowtransaction: Any, single: bool = ...
diff --git a/sqlalchemy-stubs/orm/properties.pyi b/sqlalchemy-stubs/orm/properties.pyi
@@ -1,3 +1,4 @@
+# fmt: off
 from typing import Any
 
 from .descriptor_props import CompositeProperty as CompositeProperty
@@ -7,6 +8,7 @@ from .interfaces import PropComparator
 from .interfaces import StrategizedProperty
 from .relationships import RelationshipProperty as RelationshipProperty
 from .. import util
+# fmt: on
 
 class ColumnProperty(StrategizedProperty):
     strategy_wildcard_key: str = ...
diff --git a/sqlalchemy-stubs/orm/query.pyi b/sqlalchemy-stubs/orm/query.pyi
@@ -1,6 +1,6 @@
 from typing import Any
-from typing import Optional
 from typing import List
+from typing import Optional
 
 from . import interfaces
 from .context import QueryContext as QueryContext
diff --git a/sqlalchemy-stubs/orm/relationships.pyi b/sqlalchemy-stubs/orm/relationships.pyi
@@ -19,9 +19,9 @@ from .interfaces import MANYTOONE as MANYTOONE
 from .interfaces import ONETOMANY as ONETOMANY
 from .interfaces import PropComparator as PropComparator
 from .interfaces import StrategizedProperty as StrategizedProperty
+from .mapper import Mapper
 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
diff --git a/sqlalchemy-stubs/orm/session.pyi b/sqlalchemy-stubs/orm/session.pyi
@@ -1,5 +1,7 @@
+from typing import Any
+from typing import Optional
+
 from .. import util
-from typing import Any, Optional
 from ..engine import Result
 
 class _SessionClassMethods:
diff --git a/sqlalchemy-stubs/orm/strategies.pyi b/sqlalchemy-stubs/orm/strategies.pyi
diff --git a/sqlalchemy-stubs/orm/util.pyi b/sqlalchemy-stubs/orm/util.pyi
diff --git a/sqlalchemy-stubs/pool/__init__.pyi b/sqlalchemy-stubs/pool/__init__.pyi
diff --git a/sqlalchemy-stubs/processors.pyi b/sqlalchemy-stubs/processors.pyi
diff --git a/sqlalchemy-stubs/schema.pyi b/sqlalchemy-stubs/schema.pyi
diff --git a/sqlalchemy-stubs/sql/__init__.pyi b/sqlalchemy-stubs/sql/__init__.pyi
diff --git a/sqlalchemy-stubs/sql/elements.pyi b/sqlalchemy-stubs/sql/elements.pyi
diff --git a/sqlalchemy-stubs/sql/expression.pyi b/sqlalchemy-stubs/sql/expression.pyi
diff --git a/sqlalchemy-stubs/sql/schema.pyi b/sqlalchemy-stubs/sql/schema.pyi
diff --git a/sqlalchemy-stubs/sql/selectable.pyi b/sqlalchemy-stubs/sql/selectable.pyi
diff --git a/sqlalchemy-stubs/sql/sqltypes.pyi b/sqlalchemy-stubs/sql/sqltypes.pyi
diff --git a/sqlalchemy-stubs/util/__init__.pyi b/sqlalchemy-stubs/util/__init__.pyi
diff --git a/sqlalchemy-stubs/util/compat.pyi b/sqlalchemy-stubs/util/compat.pyi

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# fmt: off`
`1`	`2`	`from .engine import create_engine as create_engine`
`2`	`3`	`from .engine import create_mock_engine as create_mock_engine`
`3`	`4`	`from .engine import engine_from_config as engine_from_config`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# fmt: off`
`1`	`2`	`from sqlalchemy import inspect as inspect`
`2`	`3`	`from sqlalchemy import Integer as Integer`
`3`	`4`	`from ... import create_engine as create_engine`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# fmt: off`
`1`	`2`	`from ... import exc as exc`
`2`	`3`	`from ...testing.provision import configure_follower as configure_follower`
`3`	`4`	`from ...testing.provision import create_db as create_db`