dirsql 0.3.22__tar.gz → 0.3.23__tar.gz

{dirsql-0.3.22 → dirsql-0.3.23}/Cargo.lock

@@ -499,7 +499,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.3.22"
+version = "0.3.23"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.3.22 → dirsql-0.3.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.3.22
+Version: 0.3.23
 Requires-Dist: pytest>=8 ; extra == 'dev'
 Requires-Dist: pytest-describe>=2 ; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.23 ; extra == 'dev'

{dirsql-0.3.22 → dirsql-0.3.23}/dirsql/_async_test.py

@@ -1,10 +1,10 @@
 """Unit tests for the DirSQL async wrapper."""
 
-from __future__ import annotations
+from unittest.mock import patch
 
 import pytest
 
-from dirsql import _async as async_mod
+import dirsql._async as async_mod
 
 
 class _FakeRustDirSQL:
@@ -50,32 +50,32 @@ class _FakeWatcherDb:
 def describe_DirSQL_async():
     def describe_ready_and_query():
         @pytest.mark.asyncio
-        async def it_uses_the_background_db(monkeypatch):
-            monkeypatch.setattr(async_mod, "_RustDirSQL", _FakeRustDirSQL)
-
-            db = async_mod.DirSQL("/tmp/root", tables=["table-a"], ignore=["**/*.tmp"])
-            await db.ready()
+        async def it_uses_the_background_db():
+            with patch.object(async_mod, "_RustDirSQL", _FakeRustDirSQL):
+                db = async_mod.DirSQL(
+                    "/tmp/root", tables=["table-a"], ignore=["**/*.tmp"]
+                )
+                await db.ready()
 
-            results = await db.query("SELECT 1")
+                results = await db.query("SELECT 1")
 
-            assert db._db.root == "/tmp/root"
-            assert db._db.tables == ["table-a"]
-            assert db._db.ignore == ["**/*.tmp"]
-            assert db._db.query_calls == ["SELECT 1"]
-            assert results == [{"sql": "SELECT 1"}]
+                assert db._db.root == "/tmp/root"
+                assert db._db.tables == ["table-a"]
+                assert db._db.ignore == ["**/*.tmp"]
+                assert db._db.query_calls == ["SELECT 1"]
+                assert results == [{"sql": "SELECT 1"}]
 
         @pytest.mark.asyncio
-        async def it_propagates_initialization_errors(monkeypatch):
+        async def it_propagates_initialization_errors():
             class _BoomDirSQL:
                 def __init__(self, *args, **kwargs):
                     raise RuntimeError("boom")
 
-            monkeypatch.setattr(async_mod, "_RustDirSQL", _BoomDirSQL)
+            with patch.object(async_mod, "_RustDirSQL", _BoomDirSQL):
+                db = async_mod.DirSQL("/tmp/root", tables=["table-a"])
 
-            db = async_mod.DirSQL("/tmp/root", tables=["table-a"])
-
-            with pytest.raises(RuntimeError, match="boom"):
-                await db.ready()
+                with pytest.raises(RuntimeError, match="boom"):
+                    await db.ready()
 
     def describe_watch_stream():
         @pytest.mark.asyncio

{dirsql-0.3.22 → dirsql-0.3.23}/dirsql/cli/binary_path_test.py

@@ -5,7 +5,7 @@ from unittest.mock import patch
 
 import pytest
 
-from dirsql.cli import binary_path as bp_module
+import dirsql.cli.binary_path as bp_module
 from dirsql.cli.binary_path import binary_path
 
 

{dirsql-0.3.22 → dirsql-0.3.23}/dirsql/cli/main_test.py

@@ -2,7 +2,6 @@
 
 import io
 import os
-import subprocess
 import sys
 from unittest.mock import patch
 
@@ -35,7 +34,9 @@ def describe_main():
             with (
                 patch.object(main_module, "binary_path", return_value="C:/dirsql.exe"),
                 patch.object(main_module, "is_windows", return_value=True),
-                patch.object(subprocess, "run", return_value=_Completed(7)) as run,
+                patch(
+                    "dirsql.cli.main.subprocess.run", return_value=_Completed(7)
+                ) as run,
             ):
                 assert main(["--version"]) == 7
             run.assert_called_once_with(["C:/dirsql.exe", "--version"])
@@ -44,7 +45,7 @@ def describe_main():
             with (
                 patch.object(main_module, "binary_path", return_value="C:/dirsql.exe"),
                 patch.object(main_module, "is_windows", return_value=True),
-                patch.object(subprocess, "run", return_value=_Completed(0)),
+                patch("dirsql.cli.main.subprocess.run", return_value=_Completed(0)),
                 patch.object(os, "execv") as execv,
             ):
                 main([])
@@ -81,7 +82,9 @@ def describe_main():
                 patch.object(sys, "argv", ["dirsql", "--help"]),
                 patch.object(main_module, "binary_path", return_value="C:/dirsql.exe"),
                 patch.object(main_module, "is_windows", return_value=True),
-                patch.object(subprocess, "run", return_value=_Completed(0)) as run,
+                patch(
+                    "dirsql.cli.main.subprocess.run", return_value=_Completed(0)
+                ) as run,
             ):
                 main(argv=None)
             run.assert_called_once_with(["C:/dirsql.exe", "--help"])
@@ -93,12 +96,10 @@ def describe_main():
 
         def it_dispatches_to_interpret_run_and_returns_its_exit_code():
             # main.py does `from .interpret.run import run` lazily, so
-            # patching the `run` function on the submodule is sufficient
-            # -- each call resolves the name freshly from the submodule.
-            from .interpret import run as run_submod
-
+            # patching the `run` function on its module by its dotted path
+            # is sufficient -- each call resolves the name freshly.
             with (
-                patch.object(run_submod, "run", return_value=0) as interpret_run,
+                patch("dirsql.cli.interpret.run.run", return_value=0) as interpret_run,
                 patch.object(main_module, "binary_path") as binary_path,
             ):
                 assert main(["interpret", "config.py"]) == 0
@@ -106,15 +107,11 @@ def describe_main():
             binary_path.assert_not_called()
 
         def it_propagates_a_nonzero_interpret_exit():
-            from .interpret import run as run_submod
-
-            with patch.object(run_submod, "run", return_value=2):
+            with patch("dirsql.cli.interpret.run.run", return_value=2):
                 assert main(["interpret", "bad.py"]) == 2
 
         def it_returns_130_on_keyboard_interrupt():
-            from .interpret import run as run_submod
-
-            with patch.object(run_submod, "run", side_effect=KeyboardInterrupt()):
+            with patch("dirsql.cli.interpret.run.run", side_effect=KeyboardInterrupt()):
                 assert main(["interpret", "config.py"]) == 130
 
         def it_does_not_intercept_when_interpret_is_not_argv_0():
@@ -123,7 +120,7 @@ def describe_main():
             with (
                 patch.object(main_module, "binary_path", return_value="/bin/dirsql"),
                 patch.object(main_module, "is_windows", return_value=True),
-                patch.object(subprocess, "run", return_value=_Completed(0)),
+                patch("dirsql.cli.main.subprocess.run", return_value=_Completed(0)),
             ):
                 main(["--verbose", "interpret", "config.py"])
             # binary_path was reached, meaning we did NOT take the

{dirsql-0.3.22 → dirsql-0.3.23}/packages/python/Cargo.toml

@@ -4,7 +4,7 @@ name = "dirsql-py-ext"
 # pypi/maturin handler can rewrite it via `write-version` before
 # `maturin build`. `pyproject.toml` declares `dynamic = ["version"]`
 # and maturin reads this field. Mirrors `packages/rust/Cargo.toml`.
-version = "0.3.22"
+version = "0.3.23"
 edition.workspace = true
 publish = false
 readme = "README.md"