fully update to flake8 6.1.0

I updated flake8 in pre-commit a few days ago but forgot to do it in tox. this flake seems to be picking inside of f-strings, which black does not fix, so fix these manually. Change-Id: I9a641a99e280fbba9d893a6f1f051b5039d5d4eb
whysage · Nov 24, 2023 · 7bc33ca · 7bc33ca
1 parent e7c0ed0
commit 7bc33ca
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 35 deletions.
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
@@ -1551,8 +1551,8 @@ def process(value):
 
                 def process(value):
                     return f"""'{
-                            value.replace("-", "").replace("'", "''")
-                        }'"""
+                        value.replace("-", "").replace("'", "''")
+                    }'"""
 
                 return process
 

diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -1706,10 +1706,10 @@ def render_bind_cast(self, type_, dbapi_type, sqltext):
             # see #9511
             dbapi_type = sqltypes.STRINGTYPE
         return f"""{sqltext}::{
-                self.dialect.type_compiler_instance.process(
-                    dbapi_type, identifier_preparer=self.preparer
-                )
-            }"""
+            self.dialect.type_compiler_instance.process(
+                dbapi_type, identifier_preparer=self.preparer
+            )
+        }"""
 
     def visit_array(self, element, **kw):
         return "ARRAY[%s]" % self.visit_clauselist(element, **kw)

diff --git a/lib/sqlalchemy/dialects/postgresql/pg8000.py b/lib/sqlalchemy/dialects/postgresql/pg8000.py
@@ -584,8 +584,8 @@ def _set_client_encoding(self, dbapi_connection, client_encoding):
         cursor = dbapi_connection.cursor()
         cursor.execute(
             f"""SET CLIENT_ENCODING TO '{
-            client_encoding.replace("'", "''")
-        }'"""
+                client_encoding.replace("'", "''")
+            }'"""
         )
         cursor.execute("COMMIT")
         cursor.close()

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
@@ -2067,15 +2067,16 @@ def _exec_insertmany_context(
             if self._echo:
                 self._log_info(sql_util._long_statement(sub_stmt))
 
-                imv_stats = f""" {
-                            imv_batch.batchnum}/{imv_batch.total_batches} ({
-                            'ordered'
-                            if imv_batch.rows_sorted else 'unordered'
-                        }{
-                            '; batch not supported'
-                            if imv_batch.is_downgraded
-                            else ''
-                        })"""
+                imv_stats = f""" {imv_batch.batchnum}/{
+                            imv_batch.total_batches
+                } ({
+                    'ordered'
+                    if imv_batch.rows_sorted else 'unordered'
+                }{
+                    '; batch not supported'
+                    if imv_batch.is_downgraded
+                    else ''
+                })"""
 
                 if imv_batch.batchnum == 1:
                     stats += imv_stats

diff --git a/lib/sqlalchemy/engine/reflection.py b/lib/sqlalchemy/engine/reflection.py
@@ -1843,7 +1843,7 @@ def _reflect_indexes(
                     if not expressions:
                         util.warn(
                             f"Skipping {flavor} {name!r} because key "
-                            f"{index+1} reflected as None but no "
+                            f"{index + 1} reflected as None but no "
                             "'expressions' were returned"
                         )
                         break

diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py
@@ -149,9 +149,11 @@ def go(obj):
 
                 raise sa_exc.InvalidRequestError(
                     "Can't apply uniqueness to row tuple containing value of "
-                    f"""type {datatype!r}; {'the values returned appear to be'
-                    if uncertain else 'this datatype produces'} """
-                    "non-hashable values"
+                    f"""type {datatype!r}; {
+                        'the values returned appear to be'
+                        if uncertain
+                        else 'this datatype produces'
+                    } non-hashable values"""
                 )
 
             return go

diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py
@@ -559,7 +559,8 @@ def _collect_update_commands(
                     f"No primary key value supplied for column(s) "
                     f"""{
                         ', '.join(
-                        str(c) for c in pks if pk_params[c._label] is None)
+                            str(c) for c in pks if pk_params[c._label] is None
+                        )
                     }; """
                     "per-row ORM Bulk UPDATE by Primary Key requires that "
                     "records contain primary key values",

diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py
@@ -1611,9 +1611,10 @@ def _raise_for_no_match(self, parent_loader, mapper_entities):
                 f"Mapped class {path[0]} does not apply to any of the "
                 f"root entities in this query, e.g. "
                 f"""{
-                    ", ".join(str(x.entity_zero)
-                    for x in mapper_entities if x.entity_zero
-                )}. Please """
+                    ", ".join(
+                        str(x.entity_zero)
+                        for x in mapper_entities if x.entity_zero
+                    )}. Please """
                 "specify the full path "
                 "from one of the root entities to the target "
                 "attribute. "

diff --git a/test/dialect/mssql/test_reflection.py b/test/dialect/mssql/test_reflection.py
@@ -389,7 +389,7 @@ def test_global_temp_different_collation(
     ):
         """test #8035"""
 
-        tname = f"##foo{random.randint(1,1000000)}"
+        tname = f"##foo{random.randint(1, 1000000)}"
 
         with temp_db_alt_collation_fixture.connect() as conn:
             conn.exec_driver_sql(f"CREATE TABLE {tname} (id int primary key)")

diff --git a/test/dialect/oracle/test_reflection.py b/test/dialect/oracle/test_reflection.py
@@ -1227,7 +1227,7 @@ def _run_test(self, metadata, connection, specs, attributes):
             for attr in attributes:
                 r_attr = getattr(reflected_type, attr)
                 e_attr = getattr(expected_spec, attr)
-                col = f"c{i+1}"
+                col = f"c{i + 1}"
                 eq_(
                     r_attr,
                     e_attr,

diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py
@@ -460,8 +460,10 @@ def _checkin_event_fixture(self, _is_asyncio=False, _has_terminate=False):
         @event.listens_for(p, "reset")
         def reset(conn, rec, state):
             canary.append(
-                f"""reset_{'rollback_ok'
-                if state.asyncio_safe else 'no_rollback'}"""
+                f"""reset_{
+                    'rollback_ok'
+                    if state.asyncio_safe else 'no_rollback'
+                }"""
             )
 
         @event.listens_for(p, "checkin")

diff --git a/test/orm/test_query.py b/test/orm/test_query.py
@@ -697,8 +697,10 @@ def process_result_value(self, value, dialect):
                     sa_exc.InvalidRequestError,
                     r"Can't apply uniqueness to row tuple "
                     r"containing value of type MyType\(\); "
-                    rf"""{'the values returned appear to be'
-                        if uncertain else 'this datatype produces'} """
+                    rf"""{
+                        'the values returned appear to be'
+                        if uncertain else 'this datatype produces'
+                    } """
                     r"non-hashable values",
                 ):
                     result = s.execute(q).unique().all()

diff --git a/test/perf/many_table_reflection.py b/test/perf/many_table_reflection.py
@@ -38,7 +38,7 @@ def generate_table(meta: sa.MetaData, min_cols, max_cols, dialect_name):
             args.append(sa.ForeignKey(f"table_{target}.table_{target}_col_1"))
         cols.append(
             sa.Column(
-                f"table_{table_num}_col_{i+1}",
+                f"table_{table_num}_col_{i + 1}",
                 *args,
                 primary_key=i == 0,
                 comment=f"primary key of table_{table_num}"

diff --git a/test/sql/test_insert_exec.py b/test/sql/test_insert_exec.py
@@ -2060,7 +2060,7 @@ def test_sentinel_on_non_autoinc_primary_key(
                 collection_cls(r),
                 collection_cls(
                     [
-                        (uuids[i], f"d{i+1}", "some_server_default")
+                        (uuids[i], f"d{i + 1}", "some_server_default")
                         for i in range(5)
                     ]
                 ),
@@ -2072,7 +2072,7 @@ def test_sentinel_on_non_autoinc_primary_key(
                 collection_cls(
                     [
                         (
-                            f"d{i+1}",
+                            f"d{i + 1}",
                             "some_server_default",
                         )
                         for i in range(5)

diff --git a/tox.ini b/tox.ini
@@ -210,7 +210,7 @@ setenv=
 [testenv:lint]
 basepython = python3
 deps=
-      flake8==6.0.0
+      flake8==6.1.0
       flake8-import-order
       flake8-builtins
       flake8-future-annotations>=0.0.5