Fix: Pytest fixtures

CHANGES

@@ -4,11 +4,21 @@
 
 <!-- Maintainers, insert changes / features for the next release here -->
 
-### Development
+### Bug fixes
+
+- ci: Fix for tests (#355)
+- unihan-etl:
+
+  - 0.26.0 -> 0.27.0 (#355)
+
+    Fix for pytest fixtures
 
-- unihan-etl: 0.25.0 -> 0.26.0
+  - 0.25.0 -> 0.26.0
+
+    pytest plugin with cached UNIHAN data.
+
+### Development
 
-  pytest plugin with cached UNIHAN data.
 - ruff: code quality improvements (#354)
 
 ## cihai 0.26.0 (2023-07-01)

docs/conf.py

@@ -4,15 +4,14 @@
 import sys
 import typing as t
 from os.path import relpath
-from pathlib import Path
 
 import cihai
 
 if t.TYPE_CHECKING:
     from sphinx.application import Sphinx
 
 # Get the project root dir, which is the parent dir of this
-cwd = Path(__file__).parent
+cwd = pathlib.Path(__file__).parent
 project_root = cwd.parent
 src_root = project_root / "src"
 
@@ -250,7 +249,7 @@ def linkcode_resolve(domain: str, info: t.Dict[str, str]) -> t.Union[None, str]:
 def remove_tabs_js(app: "Sphinx", exc: Exception) -> None:
     # Fix for sphinx-inline-tabs#18
     if app.builder.format == "html" and not exc:
-        tabs_js = Path(app.builder.outdir) / "_static" / "tabs.js"
+        tabs_js = pathlib.Path(app.builder.outdir) / "_static" / "tabs.js"
         tabs_js.unlink(missing_ok=True)
 
 

examples/variants.py

@@ -21,7 +21,7 @@ def run(unihan_options: t.Optional[t.Dict[str, object]] = None) -> None:
 
     c = Cihai(config={"unihan_options": unihan_options})
     if not c.unihan.is_bootstrapped:  # download and install Unihan to db
-        c.unihan.bootstrap(unihan_options)
+        c.unihan.bootstrap()
 
     c.unihan.add_plugin(
         "cihai.data.unihan.dataset.UnihanVariants", namespace="variants"

pyproject.toml

@@ -57,7 +57,7 @@ python = "^3.8"
 appdirs = "*"
 PyYAML = "~6.0"
 sqlalchemy = {extras = ["mypy"], version = "~2.0"}
-unihan-etl = "~=0.26.0"
+unihan-etl = "~=0.27.0"
 
 [tool.poetry.group.dev.dependencies]
 ### Docs ###

src/cihai/data/unihan/bootstrap.py

@@ -1,3 +1,4 @@
+import dataclasses
 import typing as t
 
 import sqlalchemy
@@ -10,17 +11,23 @@
 
 from .constants import UNIHAN_ETL_DEFAULT_OPTIONS, UNIHAN_FIELDS
 
+if t.TYPE_CHECKING:
+    from unihan_etl.options import Options as UnihanOptions
+
 
 def bootstrap_unihan(
     engine: sqlalchemy.Engine,
     metadata: sqlalchemy.sql.schema.MetaData,
-    options: t.Optional[t.Dict[str, object]] = None,
+    options: t.Optional[t.Union[t.Dict[str, object], "UnihanOptions"]] = None,
 ) -> None:
     if options is None:
         options = {}
 
     """Download, extract and import unihan to database."""
-    options = merge_dict(UNIHAN_ETL_DEFAULT_OPTIONS.copy(), options)
+    options = merge_dict(
+        UNIHAN_ETL_DEFAULT_OPTIONS.copy(),
+        options if isinstance(options, dict) else dataclasses.asdict(options),
+    )
 
     unihan_pkgr = unihan.Packager(options)
     unihan_pkgr.download()