Update black to 24.1.1

Change-Id: Iebd9b9e866a6a58541c187e70d4f170fdf84daff

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/python/black
-    rev: 23.3.0
+    rev: 24.1.1
     hooks:
     -   id: black
 

alembic/autogenerate/api.py

@@ -596,9 +596,9 @@ def _run_environment(
         migration_script = self.generated_revisions[-1]
         if not getattr(migration_script, "_needs_render", False):
             migration_script.upgrade_ops_list[-1].upgrade_token = upgrade_token
-            migration_script.downgrade_ops_list[
-                -1
-            ].downgrade_token = downgrade_token
+            migration_script.downgrade_ops_list[-1].downgrade_token = (
+                downgrade_token
+            )
             migration_script._needs_render = True
         else:
             migration_script._upgrade_ops.append(

alembic/autogenerate/render.py

@@ -187,9 +187,11 @@ def _render_create_table_comment(
         prefix=_alembic_autogenerate_prefix(autogen_context),
         tname=op.table_name,
         comment="%r" % op.comment if op.comment is not None else None,
-        existing="%r" % op.existing_comment
-        if op.existing_comment is not None
-        else None,
+        existing=(
+            "%r" % op.existing_comment
+            if op.existing_comment is not None
+            else None
+        ),
         schema="'%s'" % op.schema if op.schema is not None else None,
         indent="    ",
     )
@@ -216,9 +218,11 @@ def _render_drop_table_comment(
     return templ.format(
         prefix=_alembic_autogenerate_prefix(autogen_context),
         tname=op.table_name,
-        existing="%r" % op.existing_comment
-        if op.existing_comment is not None
-        else None,
+        existing=(
+            "%r" % op.existing_comment
+            if op.existing_comment is not None
+            else None
+        ),
         schema="'%s'" % op.schema if op.schema is not None else None,
         indent="    ",
     )
@@ -328,9 +332,11 @@ def _add_index(autogen_context: AutogenContext, op: ops.CreateIndexOp) -> str:
             _get_index_rendered_expressions(index, autogen_context)
         ),
         "unique": index.unique or False,
-        "schema": (", schema=%r" % _ident(index.table.schema))
-        if index.table.schema
-        else "",
+        "schema": (
+            (", schema=%r" % _ident(index.table.schema))
+            if index.table.schema
+            else ""
+        ),
         "kwargs": ", " + ", ".join(opts) if opts else "",
     }
     return text
@@ -592,9 +598,11 @@ def _get_index_rendered_expressions(
     idx: Index, autogen_context: AutogenContext
 ) -> List[str]:
     return [
-        repr(_ident(getattr(exp, "name", None)))
-        if isinstance(exp, sa_schema.Column)
-        else _render_potential_expr(exp, autogen_context, is_index=True)
+        (
+            repr(_ident(getattr(exp, "name", None)))
+            if isinstance(exp, sa_schema.Column)
+            else _render_potential_expr(exp, autogen_context, is_index=True)
+        )
         for exp in idx.expressions
     ]
 
@@ -1075,9 +1083,11 @@ def _render_check_constraint(
         )
     return "%(prefix)sCheckConstraint(%(sqltext)s%(opts)s)" % {
         "prefix": _sqlalchemy_autogenerate_prefix(autogen_context),
-        "opts": ", " + (", ".join("%s=%s" % (k, v) for k, v in opts))
-        if opts
-        else "",
+        "opts": (
+            ", " + (", ".join("%s=%s" % (k, v) for k, v in opts))
+            if opts
+            else ""
+        ),
         "sqltext": _render_potential_expr(
             constraint.sqltext, autogen_context, wrap_in_text=False
         ),

alembic/config.py

@@ -221,23 +221,20 @@ def get_template_directory(self) -> str:
     @overload
     def get_section(
         self, name: str, default: None = ...
-    ) -> Optional[Dict[str, str]]:
-        ...
+    ) -> Optional[Dict[str, str]]: ...
 
     # "default" here could also be a TypeVar
     # _MT = TypeVar("_MT", bound=Mapping[str, str]),
     # however mypy wasn't handling that correctly (pyright was)
     @overload
     def get_section(
         self, name: str, default: Dict[str, str]
-    ) -> Dict[str, str]:
-        ...
+    ) -> Dict[str, str]: ...
 
     @overload
     def get_section(
         self, name: str, default: Mapping[str, str]
-    ) -> Union[Dict[str, str], Mapping[str, str]]:
-        ...
+    ) -> Union[Dict[str, str], Mapping[str, str]]: ...
 
     def get_section(
         self, name: str, default: Optional[Mapping[str, str]] = None
@@ -313,14 +310,12 @@ def get_section_option(
             return default
 
     @overload
-    def get_main_option(self, name: str, default: str) -> str:
-        ...
+    def get_main_option(self, name: str, default: str) -> str: ...
 
     @overload
     def get_main_option(
         self, name: str, default: Optional[str] = None
-    ) -> Optional[str]:
-        ...
+    ) -> Optional[str]: ...
 
     def get_main_option(
         self, name: str, default: Optional[str] = None

alembic/ddl/_autogen.py

@@ -287,18 +287,22 @@ def __init__(
             self.target_table,
             tuple(self.target_columns),
         ) + (
-            (None if onupdate.lower() == "no action" else onupdate.lower())
-            if onupdate
-            else None,
-            (None if ondelete.lower() == "no action" else ondelete.lower())
-            if ondelete
-            else None,
+            (
+                (None if onupdate.lower() == "no action" else onupdate.lower())
+                if onupdate
+                else None
+            ),
+            (
+                (None if ondelete.lower() == "no action" else ondelete.lower())
+                if ondelete
+                else None
+            ),
             # convert initially + deferrable into one three-state value
-            "initially_deferrable"
-            if initially and initially.lower() == "deferred"
-            else "deferrable"
-            if deferrable
-            else "not deferrable",
+            (
+                "initially_deferrable"
+                if initially and initially.lower() == "deferred"
+                else "deferrable" if deferrable else "not deferrable"
+            ),
         )
 
     @util.memoized_property

alembic/ddl/base.py

@@ -40,7 +40,6 @@
 
 
 class AlterTable(DDLElement):
-
     """Represent an ALTER TABLE statement.
 
     Only the string name and optional schema name of the table
@@ -238,9 +237,11 @@ def visit_column_default(
     return "%s %s %s" % (
         alter_table(compiler, element.table_name, element.schema),
         alter_column(compiler, element.column_name),
-        "SET DEFAULT %s" % format_server_default(compiler, element.default)
-        if element.default is not None
-        else "DROP DEFAULT",
+        (
+            "SET DEFAULT %s" % format_server_default(compiler, element.default)
+            if element.default is not None
+            else "DROP DEFAULT"
+        ),
     )
 
 

alembic/ddl/impl.py

@@ -77,7 +77,6 @@ def __init__(
 
 
 class DefaultImpl(metaclass=ImplMeta):
-
     """Provide the entrypoint for major migration operations,
     including database-specific behavioral variances.
 
@@ -425,13 +424,15 @@ def bulk_insert(
                 self._exec(
                     sqla_compat._insert_inline(table).values(
                         **{
-                            k: sqla_compat._literal_bindparam(
-                                k, v, type_=table.c[k].type
-                            )
-                            if not isinstance(
-                                v, sqla_compat._literal_bindparam
+                            k: (
+                                sqla_compat._literal_bindparam(
+                                    k, v, type_=table.c[k].type
+                                )
+                                if not isinstance(
+                                    v, sqla_compat._literal_bindparam
+                                )
+                                else v
                             )
-                            else v
                             for k, v in row.items()
                         }
                     )

alembic/ddl/mysql.py

@@ -94,21 +94,29 @@ def alter_column(  # type:ignore[override]
                     column_name,
                     schema=schema,
                     newname=name if name is not None else column_name,
-                    nullable=nullable
-                    if nullable is not None
-                    else existing_nullable
-                    if existing_nullable is not None
-                    else True,
+                    nullable=(
+                        nullable
+                        if nullable is not None
+                        else (
+                            existing_nullable
+                            if existing_nullable is not None
+                            else True
+                        )
+                    ),
                     type_=type_ if type_ is not None else existing_type,
-                    default=server_default
-                    if server_default is not False
-                    else existing_server_default,
-                    autoincrement=autoincrement
-                    if autoincrement is not None
-                    else existing_autoincrement,
-                    comment=comment
-                    if comment is not False
-                    else existing_comment,
+                    default=(
+                        server_default
+                        if server_default is not False
+                        else existing_server_default
+                    ),
+                    autoincrement=(
+                        autoincrement
+                        if autoincrement is not None
+                        else existing_autoincrement
+                    ),
+                    comment=(
+                        comment if comment is not False else existing_comment
+                    ),
                 )
             )
         elif (
@@ -123,21 +131,29 @@ def alter_column(  # type:ignore[override]
                     column_name,
                     schema=schema,
                     newname=name if name is not None else column_name,
-                    nullable=nullable
-                    if nullable is not None
-                    else existing_nullable
-                    if existing_nullable is not None
-                    else True,
+                    nullable=(
+                        nullable
+                        if nullable is not None
+                        else (
+                            existing_nullable
+                            if existing_nullable is not None
+                            else True
+                        )
+                    ),
                     type_=type_ if type_ is not None else existing_type,
-                    default=server_default
-                    if server_default is not False
-                    else existing_server_default,
-                    autoincrement=autoincrement
-                    if autoincrement is not None
-                    else existing_autoincrement,
-                    comment=comment
-                    if comment is not False
-                    else existing_comment,
+                    default=(
+                        server_default
+                        if server_default is not False
+                        else existing_server_default
+                    ),
+                    autoincrement=(
+                        autoincrement
+                        if autoincrement is not None
+                        else existing_autoincrement
+                    ),
+                    comment=(
+                        comment if comment is not False else existing_comment
+                    ),
                 )
             )
         elif server_default is not False:
@@ -368,9 +384,11 @@ def _mysql_alter_default(
     return "%s ALTER COLUMN %s %s" % (
         alter_table(compiler, element.table_name, element.schema),
         format_column_name(compiler, element.column_name),
-        "SET DEFAULT %s" % format_server_default(compiler, element.default)
-        if element.default is not None
-        else "DROP DEFAULT",
+        (
+            "SET DEFAULT %s" % format_server_default(compiler, element.default)
+            if element.default is not None
+            else "DROP DEFAULT"
+        ),
     )
 
 

alembic/ddl/oracle.py

@@ -141,9 +141,11 @@ def visit_column_default(
     return "%s %s %s" % (
         alter_table(compiler, element.table_name, element.schema),
         alter_column(compiler, element.column_name),
-        "DEFAULT %s" % format_server_default(compiler, element.default)
-        if element.default is not None
-        else "DEFAULT NULL",
+        (
+            "DEFAULT %s" % format_server_default(compiler, element.default)
+            if element.default is not None
+            else "DEFAULT NULL"
+        ),
     )
 
 

alembic/operations/base.py

@@ -406,8 +406,7 @@ def get_context(self) -> MigrationContext:
         return self.migration_context
 
     @overload
-    def invoke(self, operation: CreateTableOp) -> Table:
-        ...
+    def invoke(self, operation: CreateTableOp) -> Table: ...
 
     @overload
     def invoke(
@@ -427,12 +426,10 @@ def invoke(
             DropTableOp,
             ExecuteSQLOp,
         ],
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
-    def invoke(self, operation: MigrateOperation) -> Any:
-        ...
+    def invoke(self, operation: MigrateOperation) -> Any: ...
 
     def invoke(self, operation: MigrateOperation) -> Any:
         """Given a :class:`.MigrateOperation`, invoke it in terms of

alembic/operations/ops.py

@@ -1371,9 +1371,9 @@ def to_table(
             info=self.info.copy() if self.info else {},
             prefixes=list(self.prefixes) if self.prefixes else [],
             schema=self.schema,
-            _constraints_included=self._reverse._constraints_included
-            if self._reverse
-            else False,
+            _constraints_included=(
+                self._reverse._constraints_included if self._reverse else False
+            ),
             **self.table_kw,
         )
         return t