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

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

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "sqlite_export_for_ynab"
-version = "2.9.8"
+version = "2.9.9"
 description = "SQLite Export for YNAB - Export YNAB Data to SQLite"
 readme = "README.md"
 requires-python = ">=3.11"  # generated by mxr/base
@@ -20,15 +20,14 @@ dependencies = [
   "aiosqlite",
   "asyncio-for-ynab~=1.87.0",
   "fasteners",
-  "rich>=10",
+  "rich>=12",
   "tenacity",
-  "typing-extensions; python_version<'3.12'",
 ]
 
 [project.urls]  # generated by mxr/base
 Homepage = "https://github.com/mxr/sqlite-export-for-ynab"
 
-[project.scripts]
+[project.scripts]  # generated by mxr/base
 sqlite-export-for-ynab = "sqlite_export_for_ynab._main:main"
 
 [dependency-groups]
@@ -125,6 +124,7 @@ env_list = ["py", "pre-commit"]
 [tool.tox.env.pre-commit]  # generated by mxr/base
 commands = [["pre-commit", "run", "--all-files", "--show-diff-on-failure"]]
 deps = ["pre-commit-uv"]
+runner = "uv-venv-runner"
 skip_install = true
 
 [tool.tox.env_run_base]  # generated by mxr/base
@@ -134,6 +134,7 @@ commands = [
   ["coverage", "report"],
 ]
 dependency_groups = ["dev"]
+runner = "uv-venv-lock-runner"
 
 [tool.ty.rules]  # generated by mxr/base
 all = "error"

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

@@ -43,10 +43,12 @@ 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
 from rich.progress import TimeElapsedColumn
+from tenacity import AsyncRetrying
 from tenacity import retry
 from tenacity import stop_after_attempt
 
@@ -64,48 +66,15 @@ _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",
@@ -693,15 +662,17 @@ class _ProgressYnab:
     lkos: dict[str, int]
     task_id: TaskID
 
-    @retry(stop=stop_after_attempt(3))
     async def get(self, endpoint: Callable[..., Awaitable[_T]]) -> _T:
-        try:
-            return await endpoint(
-                plan_id=self.plan_id,
-                last_knowledge_of_server=self.lkos.get(self.plan_id),
-            )
-        finally:
-            self.context.progress.update(self.task_id, advance=1)
+        async for attempt in AsyncRetrying(stop=stop_after_attempt(3)):
+            with attempt:
+                try:
+                    return await endpoint(
+                        plan_id=self.plan_id,
+                        last_knowledge_of_server=self.lkos.get(self.plan_id),
+                    )
+                finally:
+                    self.context.progress.update(self.task_id, advance=1)
+        raise AssertionError("unreachable")
 
 
 @dataclass(slots=True, frozen=True)

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

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

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

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