cihai-cli 0.26.0__tar.gz → 0.27.0__tar.gz

{cihai_cli-0.26.0 → cihai_cli-0.27.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cihai-cli
-Version: 0.26.0
+Version: 0.27.0
 Summary: Command line frontend for the cihai CJK language library
 Home-page: https://cihai-cli.git-pull.com
 License: MIT
@@ -25,7 +25,7 @@ Classifier: Topic :: Software Development :: Localization
 Classifier: Topic :: System :: Shells
 Classifier: Topic :: Utilities
 Requires-Dist: PyYAML
-Requires-Dist: cihai (>=0.31.0,<0.32.0)
+Requires-Dist: cihai (>=0.32.0,<0.33.0)
 Project-URL: Bug Tracker, https://github.com/cihai/cihai-cli/issues
 Project-URL: Documentation, https://cihai-cli.git-pull.com
 Project-URL: Q & A, https://github.com/cihai/cihai-cli/discussions

{cihai_cli-0.26.0 → cihai_cli-0.27.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cihai-cli"
-version = "0.26.0"
+version = "0.27.0"
 description = "Command line frontend for the cihai CJK language library"
 license = "MIT"
 authors = ["Tony Narlock <tony@git-pull.com>"]
@@ -58,7 +58,7 @@ Repository = "https://github.com/cihai/cihai-cli"
 
 [tool.poetry.dependencies]
 python = "^3.8"
-cihai = "~0.31.0"
+cihai = "~0.32.0"
 PyYAML = "*"
 
 [tool.poetry.group.docs.dependencies]

{cihai_cli-0.26.0 → cihai_cli-0.27.0}/src/cihai_cli/__about__.py

@@ -1,7 +1,8 @@
 """Metadata for cihai_cli package."""
+
 __title__ = "cihai-cli"
 __package_name__ = "cihai_cli"
-__version__ = "0.26.0"
+__version__ = "0.27.0"
 __description__ = "Command line frontend for the cihai CJK language library"
 __author__ = "Tony Narlock"
 __email__ = "tony@git-pull.com"

{cihai_cli-0.26.0 → cihai_cli-0.27.0}/src/cihai_cli/cli.py

@@ -1,4 +1,5 @@
 """CLI functionality for cihai-cli."""
+
 import argparse
 import logging
 import sys
@@ -12,6 +13,9 @@ from unihan_etl.__about__ import __version__ as unihan_etl_version
 
 from .__about__ import __version__
 
+log = logging.getLogger(__name__)
+
+
 #: fields which are human friendly
 HUMAN_UNIHAN_FIELDS = [
     "char",
@@ -90,18 +94,18 @@ def cli(_args: t.Optional[t.List[str]] = None) -> None:
     c = Cihai.from_file(args.config_file) if args.config_file else Cihai()
 
     if not c.unihan.is_bootstrapped:
-        print("Bootstrapping Unihan database")
+        log.info("Bootstrapping Unihan database")
         c.unihan.bootstrap(options=c.config.get("unihan_options", {}))
 
     if args.subparser_name is None:
         parser.print_help()
         return
-    elif args.subparser_name == "info":
+    if args.subparser_name == "info":
         command_info(c=c, char=args.char, show_all=args.show_all)
     elif args.subparser_name == "reverse":
         command_reverse(c=c, char=args.char, show_all=args.show_all)
     else:
-        print(f"No subparser for {args.subparser_name}")
+        log.info(f"No subparser for {args.subparser_name}")
 
 
 def create_info_subparser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
@@ -122,7 +126,7 @@ def command_info(c: Cihai, char: str, show_all: bool) -> None:
     query = c.unihan.lookup_char(char).first()
     attrs = {}
     if not query:
-        print("No records found for %s" % char)
+        log.info(f"No records found for {char}")
         sys.exit()
     for col, _, _ in query.__table__.columns._collection:
         value = getattr(query, col)
@@ -130,7 +134,7 @@ def command_info(c: Cihai, char: str, show_all: bool) -> None:
             if not show_all and str(col) not in HUMAN_UNIHAN_FIELDS:
                 continue
             attrs[str(col)] = value
-    print(
+    log.info(
         yaml.safe_dump(attrs, allow_unicode=True, default_flow_style=False).strip("\n"),
     )
 
@@ -154,7 +158,7 @@ def command_reverse(c: Cihai, char: str, show_all: bool) -> None:
     """Lookup a word or phrase by searching definitions."""
     query = c.unihan.reverse_char([char])
     if not query.count():
-        print("No records found for %s" % char)
+        log.info("No records found for %s" % char)
         sys.exit()
     for k in query:
         attrs = {}
@@ -164,12 +168,12 @@ def command_reverse(c: Cihai, char: str, show_all: bool) -> None:
                 if not show_all and str(c) not in HUMAN_UNIHAN_FIELDS:
                     continue
                 attrs[str(c)] = value
-        print(
+        log.info(
             yaml.safe_dump(attrs, allow_unicode=True, default_flow_style=False).strip(
                 "\n",
             ),
         )
-        print("--------")
+        log.info("--------")
 
 
 def setup_logger(

{cihai_cli-0.26.0 → cihai_cli-0.27.0}/tests/conftest.py

@@ -1,4 +1,5 @@
 """Pytest configuration."""
+
 import pathlib
 import typing as t
 import zipfile
@@ -11,31 +12,31 @@ if t.TYPE_CHECKING:
     from cihai.types import UntypedDict as UnihanOptions
 
 
-@pytest.fixture
+@pytest.fixture()
 def tests_path() -> pathlib.Path:
     """Return tests/ directory."""
     return pathlib.Path(__file__).parent
 
 
-@pytest.fixture
+@pytest.fixture()
 def fixture_path(tests_path: pathlib.Path) -> pathlib.Path:
     """Return tests/fixtures/ directory."""
     return tests_path / "fixtures"
 
 
-@pytest.fixture
+@pytest.fixture()
 def test_config_file(fixture_path: pathlib.Path) -> pathlib.Path:
     """Return test_config.yml file."""
     return fixture_path / "test_config.yml"
 
 
-@pytest.fixture
+@pytest.fixture()
 def zip_path(tmp_path: pathlib.Path) -> pathlib.Path:
     """Return Unihan.zip in temporary path."""
     return tmp_path / "Unihan.zip"
 
 
-@pytest.fixture
+@pytest.fixture()
 def zip_file(zip_path: pathlib.Path, fixture_path: pathlib.Path) -> zipfile.ZipFile:
     """Create and return ZipFile."""
     _files = []
@@ -48,7 +49,7 @@ def zip_file(zip_path: pathlib.Path, fixture_path: pathlib.Path) -> zipfile.ZipF
     return zf
 
 
-@pytest.fixture
+@pytest.fixture()
 def unihan_options(
     zip_file: zipfile.ZipFile,
     zip_path: pathlib.Path,
@@ -62,7 +63,7 @@ def unihan_options(
     }
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def tmpdb_file(tmpdir: pathlib.Path) -> pathlib.Path:
     """Return test SQLite database."""
     return tmpdir / "test.db"

{cihai_cli-0.26.0 → cihai_cli-0.27.0}/tests/test_cli.py

@@ -1,4 +1,5 @@
 """CLI tests for cihai-cli."""
+
 import contextlib
 import pathlib
 import typing as t
@@ -36,6 +37,7 @@ def test_cli(
 def test_cli_reflects_after_bootstrap(
     tmp_path: pathlib.Path,
     capsys: pytest.CaptureFixture[str],
+    caplog: pytest.LogCaptureFixture,
     monkeypatch: pytest.MonkeyPatch,
     tmpdb_file: pathlib.Path,
     unihan_options: "UnihanOptions",
@@ -58,22 +60,23 @@ def test_cli_reflects_after_bootstrap(
     try:
         cli(["-c", str(config_file), "info", "㐀"])
     except SystemExit:
-        result = capsys.readouterr()
-        output = "".join(list(result.out))
+        output = "".join(list(caplog.messages) + list(capsys.readouterr().out))
         assert "Bootstrapping Unihan database" in output
 
+    caplog.clear()
+
     try:
         cli(["-c", str(config_file), "info"])
     except SystemExit:
-        result = capsys.readouterr()
-        output = "".join(list(result.out))
-        assert "Bootstrapping" in output
+        output = "".join(list(capsys.readouterr().err))
+        assert "cihai info" in output
 
 
 @pytest.mark.parametrize("flag", ["-V", "--version"])
 def test_cli_version(
     tmp_path: pathlib.Path,
     capsys: pytest.CaptureFixture[str],
+    caplog: pytest.LogCaptureFixture,
     monkeypatch: pytest.MonkeyPatch,
     flag: str,
 ) -> None:
@@ -81,8 +84,7 @@ def test_cli_version(
     try:
         cli([flag])
     except SystemExit:
-        result = capsys.readouterr()
-        output = "".join(list(result.out))
+        output = "".join(list(caplog.messages) + list(capsys.readouterr().out))
         assert "cihai-cli" in output
         assert "cihai" in output
         assert "unihan-etl" in output