From 5d7a3c3b4c611b8d478cee2618cc592f2adc48a2 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Sat, 1 Jul 2023 12:35:01 -0500
Subject: [PATCH] ci(ruff): Automated lint fixes

---
 docs/conf.py               |  2 +-
 examples/01_bootstrap.py   |  1 -
 src/unihan_db/bootstrap.py | 18 +++++++-----------
 src/unihan_db/importer.py  |  3 ++-
 tests/conftest.py          |  4 ++--
 tests/test_bootstrap.py    |  6 +++---
 6 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index ff4091a8..c90595ed 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -173,7 +173,7 @@
 
 def linkcode_resolve(
     domain: str, info: t.Dict[str, str]
-) -> t.Union[None, str]:  # NOQA: C901
+) -> t.Union[None, str]:
     """
     Determine the URL corresponding to Python object
 
diff --git a/examples/01_bootstrap.py b/examples/01_bootstrap.py
index 627bbebd..96b30b2f 100755
--- a/examples/01_bootstrap.py
+++ b/examples/01_bootstrap.py
@@ -2,7 +2,6 @@
 import pprint
 
 from sqlalchemy.sql.expression import func
-
 from unihan_db import bootstrap
 from unihan_db.tables import Unhn
 
diff --git a/src/unihan_db/bootstrap.py b/src/unihan_db/bootstrap.py
index e1b2705e..eebb24f0 100644
--- a/src/unihan_db/bootstrap.py
+++ b/src/unihan_db/bootstrap.py
@@ -1,12 +1,14 @@
 import logging
 import sys
-from datetime import datetime
 import typing as t
-from sqlalchemy import create_engine, event
+from datetime import datetime
+
 import sqlalchemy
+from sqlalchemy import create_engine, event
 from sqlalchemy.orm import Session, class_mapper, scoped_session, sessionmaker
 from sqlalchemy.orm.decl_api import registry
 from sqlalchemy.orm.scoping import ScopedSession
+
 from unihan_etl import core as unihan
 from unihan_etl.types import UntypedUnihanData
 from unihan_etl.util import merge_dict
@@ -135,13 +137,10 @@ def setup_logger(
 def is_bootstrapped(metadata: sqlalchemy.MetaData) -> bool:
     """Return True if cihai is correctly bootstrapped."""
     fields = UNIHAN_FIELDS + DEFAULT_FIELDS
-    if TABLE_NAME in metadata.tables.keys():
+    if TABLE_NAME in metadata.tables:
         table = metadata.tables[TABLE_NAME]
 
-        if set(fields) == {c.name for c in table.columns}:
-            return True
-        else:
-            return False
+        return set(fields) == {c.name for c in table.columns}
     else:
         return False
 
@@ -224,10 +223,7 @@ def _get_key_value(c: str) -> t.Any:
 
     _found: t.Set[t.Any]
 
-    if found is None:
-        _found = set()
-    else:
-        _found = found
+    _found = set() if found is None else found
 
     _mapper = class_mapper(obj.__class__)
     columns = [column.key for column in _mapper.columns]
diff --git a/src/unihan_db/importer.py b/src/unihan_db/importer.py
index 51feafb2..d0852876 100644
--- a/src/unihan_db/importer.py
+++ b/src/unihan_db/importer.py
@@ -1,4 +1,5 @@
 import typing as t
+
 from unihan_db.tables import (
     Unhn,
     UnhnLocation,
@@ -58,7 +59,7 @@ def import_char(
             t.Dict[str, object],
         ],
     ],
-) -> None:  # NOQA: C901
+) -> None:
     if "kDefinition" in char:
         for kd in char["kDefinition"]:
             c.kDefinition.append(kDefinition(definition=kd))
diff --git a/tests/conftest.py b/tests/conftest.py
index 19f2b996..8c7e71a8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2,10 +2,10 @@
 import pathlib
 import typing as t
 import zipfile
-import sqlalchemy
 
 import pytest
-from sqlalchemy.orm import sessionmaker, scoped_session
+import sqlalchemy
+from sqlalchemy.orm import scoped_session, sessionmaker
 from sqlalchemy.orm.scoping import ScopedSession
 from unihan_db.bootstrap import UNIHAN_FILES
 
diff --git a/tests/test_bootstrap.py b/tests/test_bootstrap.py
index 54b6d51e..f70c3792 100644
--- a/tests/test_bootstrap.py
+++ b/tests/test_bootstrap.py
@@ -1,10 +1,10 @@
 import pathlib
-from sqlalchemy.orm import Session
-from unihan_db import bootstrap
-from unihan_db.tables import Base, Unhn
 import typing as t
 
 import sqlalchemy
+from sqlalchemy.orm import Session
+from unihan_db import bootstrap
+from unihan_db.tables import Base, Unhn
 
 
 class UnihanOptions(t.TypedDict):