sqlite-export-for-ynab 2.9.9__tar.gz → 2.9.10__tar.gz

{sqlite_export_for_ynab-2.9.9/sqlite_export_for_ynab.egg-info → sqlite_export_for_ynab-2.9.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlite_export_for_ynab
-Version: 2.9.9
+Version: 2.9.10
 Summary: SQLite Export for YNAB - Export YNAB Data to SQLite
 Author-email: Max R <mxr@users.noreply.github.com>
 License-Expression: MIT
@@ -18,8 +18,9 @@ Requires-Dist: aiopathlib
 Requires-Dist: aiosqlite
 Requires-Dist: asyncio-for-ynab~=1.87.0
 Requires-Dist: fasteners
-Requires-Dist: rich>=12
+Requires-Dist: rich>=10
 Requires-Dist: tenacity
+Requires-Dist: typing-extensions; python_version < "3.12"
 Dynamic: license-file
 
 # sqlite-export-for-ynab

{sqlite_export_for_ynab-2.9.9 → sqlite_export_for_ynab-2.9.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sqlite_export_for_ynab"
-version = "2.9.9"
+version = "2.9.10"
 description = "SQLite Export for YNAB - Export YNAB Data to SQLite"
 readme = "README.md"
 requires-python = ">=3.11"  # generated by mxr/base
@@ -20,8 +20,9 @@ dependencies = [
   "aiosqlite",
   "asyncio-for-ynab~=1.87.0",
   "fasteners",
-  "rich>=12",
+  "rich>=10",
   "tenacity",
+  "typing-extensions; python_version<'3.12'",
 ]
 
 [project.urls]  # generated by mxr/base

{sqlite_export_for_ynab-2.9.9 → sqlite_export_for_ynab-2.9.10}/sqlite_export_for_ynab/_main.py

@@ -43,7 +43,6 @@ from asyncio_for_ynab import TransactionsApi
 from asyncio_for_ynab import TransactionsResponse
 from asyncio_for_ynab import TransactionsResponseData
 from rich.progress import BarColumn
-from rich.progress import MofNCompleteColumn
 from rich.progress import Progress
 from rich.progress import TaskID
 from rich.progress import TextColumn
@@ -66,15 +65,48 @@ _T = TypeVar("_T")
 
 if sys.version_info >= (3, 12):  # pragma: >=3.12 cover
     from itertools import batched
+    from typing import override
 else:  # pragma: <3.12 cover
     from itertools import islice
 
+    from typing_extensions import override
+
     def batched(iterable: Iterable[_T], n: int) -> Iterator[tuple[_T, ...]]:
         it = iter(iterable)
         while batch := tuple(islice(it, n)):
             yield batch
 
 
+try:
+    from rich.progress import (
+        MofNCompleteColumn,  # pyright: ignore[reportAssignmentType]
+    )
+# https://github.com/benleb/surepy/issues/240
+except ImportError:  # pragma: no cover
+    from rich.progress import ProgressColumn
+    from rich.progress import Task
+    from rich.text import Text
+
+    if TYPE_CHECKING:
+        from rich.table import Column
+
+    class MofNCompleteColumn(ProgressColumn):  # type:ignore[no-redef]
+        def __init__(self, separator: str = "/", table_column: Column | None = None):
+            self.separator = separator
+            super().__init__(table_column=table_column)
+
+        @override
+        def render(self, task: Task) -> Text:
+            """Show completed/total."""
+            completed = int(task.completed)
+            total = int(task.total) if task.total is not None else "?"
+            total_width = len(str(total))
+            return Text(
+                f"{completed:{total_width}d}{self.separator}{total}",
+                style="progress.download",
+            )
+
+
 _EntryTable = Literal[
     "accounts",
     "account_periodic_values",

{sqlite_export_for_ynab-2.9.9 → sqlite_export_for_ynab-2.9.10/sqlite_export_for_ynab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlite_export_for_ynab
-Version: 2.9.9
+Version: 2.9.10
 Summary: SQLite Export for YNAB - Export YNAB Data to SQLite
 Author-email: Max R <mxr@users.noreply.github.com>
 License-Expression: MIT
@@ -18,8 +18,9 @@ Requires-Dist: aiopathlib
 Requires-Dist: aiosqlite
 Requires-Dist: asyncio-for-ynab~=1.87.0
 Requires-Dist: fasteners
-Requires-Dist: rich>=12
+Requires-Dist: rich>=10
 Requires-Dist: tenacity
+Requires-Dist: typing-extensions; python_version < "3.12"
 Dynamic: license-file
 
 # sqlite-export-for-ynab

{sqlite_export_for_ynab-2.9.9 → sqlite_export_for_ynab-2.9.10}/sqlite_export_for_ynab.egg-info/requires.txt

@@ -3,5 +3,8 @@ aiopathlib
 aiosqlite
 asyncio-for-ynab~=1.87.0
 fasteners
-rich>=12
+rich>=10
 tenacity
+
+[:python_version < "3.12"]
+typing-extensions

{sqlite_export_for_ynab-2.9.9 → sqlite_export_for_ynab-2.9.10}/tests/_main_test.py

@@ -3,8 +3,10 @@ from __future__ import annotations
 import tomllib
 from datetime import date
 from pathlib import Path
+from unittest.mock import ANY
 from unittest.mock import AsyncMock
 from unittest.mock import Mock
+from unittest.mock import call
 from unittest.mock import patch
 
 import aiosqlite
@@ -1048,8 +1050,7 @@ async def test_sync_lock_times_out(mock_get_running_loop, mock_acquire, tmp_path
             timeout=0.1,
         ).__aenter__()
 
-    assert mock_acquire.call_count == 1
-    assert mock_acquire.call_args.args[1] is False
+    mock_acquire.assert_called_once_with(ANY, False)
 
 
 @patch(
@@ -1085,8 +1086,7 @@ async def test_context_retries_after_sleep(
     ):
         pass
 
-    assert mock_acquire.call_count == 2
-    assert mock_acquire.call_args_list[0].args[1] is False
+    assert mock_acquire.call_args_list == [call(ANY, False), call(ANY, False)]
     assert mock_sleep.call_count == 1
     assert mock_release.call_count == 1