dirsql 0.3.4__tar.gz → 0.3.5__tar.gz

{dirsql-0.3.4 → dirsql-0.3.5}/Cargo.lock

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

{dirsql-0.3.4 → dirsql-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.3.4
+Version: 0.3.5
 Requires-Dist: pytest>=8 ; extra == 'dev'
 Requires-Dist: pytest-describe>=2 ; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.23 ; extra == 'dev'
@@ -33,7 +33,7 @@ Each wheel also bundles the `dirsql` HTTP-server CLI as a console script, so `pi
 
 ## Publishing (maintainers)
 
-Handled by `.github/workflows/publish.yml` (invoked from `minor-release.yml` / `patch-release.yml`). For each target triple the `build` job `cargo build`s the Rust CLI with `--features cli`, stages the binary into `python/dirsql/_binary/`, runs `maturin build` (which picks the binary up via the `[tool.maturin] include` rule in `pyproject.toml`), and the wheels + sdist are then trusted-published to PyPI.
+Handled by `.github/workflows/publish.yml` (invoked from `minor-release.yml` / `patch-release.yml`). For each target triple the `build` job `cargo build`s the Rust CLI with `--features cli`, stages the binary into `dirsql/_binary/`, runs `maturin build` (which picks the binary up via the `[tool.maturin] include` rule in `pyproject.toml`), and the wheels + sdist are then trusted-published to PyPI.
 
 ## Quick Start
 

{dirsql-0.3.4/packages/python → dirsql-0.3.5}/README.md

@@ -16,7 +16,7 @@ Each wheel also bundles the `dirsql` HTTP-server CLI as a console script, so `pi
 
 ## Publishing (maintainers)
 
-Handled by `.github/workflows/publish.yml` (invoked from `minor-release.yml` / `patch-release.yml`). For each target triple the `build` job `cargo build`s the Rust CLI with `--features cli`, stages the binary into `python/dirsql/_binary/`, runs `maturin build` (which picks the binary up via the `[tool.maturin] include` rule in `pyproject.toml`), and the wheels + sdist are then trusted-published to PyPI.
+Handled by `.github/workflows/publish.yml` (invoked from `minor-release.yml` / `patch-release.yml`). For each target triple the `build` job `cargo build`s the Rust CLI with `--features cli`, stages the binary into `dirsql/_binary/`, runs `maturin build` (which picks the binary up via the `[tool.maturin] include` rule in `pyproject.toml`), and the wheels + sdist are then trusted-published to PyPI.
 
 ## Quick Start
 

{dirsql-0.3.4 → dirsql-0.3.5}/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.4"
+version = "0.3.5"
 edition.workspace = true
 publish = false
 readme = "README.md"

{dirsql-0.3.4 → dirsql-0.3.5/packages/python}/README.md

@@ -16,7 +16,7 @@ Each wheel also bundles the `dirsql` HTTP-server CLI as a console script, so `pi
 
 ## Publishing (maintainers)
 
-Handled by `.github/workflows/publish.yml` (invoked from `minor-release.yml` / `patch-release.yml`). For each target triple the `build` job `cargo build`s the Rust CLI with `--features cli`, stages the binary into `python/dirsql/_binary/`, runs `maturin build` (which picks the binary up via the `[tool.maturin] include` rule in `pyproject.toml`), and the wheels + sdist are then trusted-published to PyPI.
+Handled by `.github/workflows/publish.yml` (invoked from `minor-release.yml` / `patch-release.yml`). For each target triple the `build` job `cargo build`s the Rust CLI with `--features cli`, stages the binary into `dirsql/_binary/`, runs `maturin build` (which picks the binary up via the `[tool.maturin] include` rule in `pyproject.toml`), and the wheels + sdist are then trusted-published to PyPI.
 
 ## Quick Start
 

{dirsql-0.3.4 → dirsql-0.3.5}/packages/rust/Cargo.toml

@@ -6,7 +6,11 @@ description = "Ephemeral SQL index over a local directory"
 # version stays for the binding crates (publish = false).
 version = "0.2.7"
 edition.workspace = true
-license.workspace = true
+# Literal `license` (not `license.workspace = true`) because
+# putitoutthere's preflight check reads `[package].license` directly
+# from the crate's Cargo.toml and does not resolve workspace
+# inheritance, surfacing PIOT_CRATES_MISSING_METADATA otherwise.
+license = "MIT"
 repository.workspace = true
 # `docs/` is a symlink to the workspace `docs/` so the markdown ships with the
 # crate; everything below is the VitePress build tooling we don't want to ship.

dirsql-0.3.5/pyproject.toml

@@ -0,0 +1,71 @@
+[build-system]
+requires = ["maturin>=1.0,<2.0"]
+build-backend = "maturin"
+
+[project]
+name = "dirsql"
+# Maturin reads the version from `packages/python/Cargo.toml`'s
+# `[package].version` (see `dynamic = ["version"]`). Putitoutthere's
+# `write-version` step rewrites that literal before `maturin build` so
+# wheels ship at the planned version, not the literal on disk.
+dynamic = ["version"]
+description = "Ephemeral SQL index over a local directory"
+license = "MIT"
+requires-python = ">=3.10"
+authors = [
+    { name = "Kevin Scott" },
+]
+repository = "https://github.com/thekevinscott/dirsql"
+keywords = ["sql", "filesystem", "directory", "sqlite", "index"]
+readme = "README.md"
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=8",
+    "pytest-describe>=2",
+    "pytest-asyncio>=0.23",
+    "pytest-cov>=5",
+    "ruff>=0.4",
+    "maturin>=1.0",
+]
+
+[project.scripts]
+dirsql = "dirsql._cli.main:main"
+
+[tool.maturin]
+features = ["extension-module"]
+exclude = [
+    "tests/",
+]
+# `python-source` intentionally unset: the maturin-recommended mixed
+# layout (`python-source = "python"`) is unsupported by upstream
+# putitoutthere's wheel-content verifier, which compares `stage_to`
+# against the literal in-wheel path without subtracting the
+# source-root prefix that maturin strips. Filed at
+# thekevinscott/putitoutthere; revert this flatten (and re-add
+# `python-source = "python"`) once upstream's verifier handles
+# python-source stripping.
+module-name = "dirsql._dirsql"
+# putitoutthere's `[package.bundle_cli]` recipe (see putitoutthere.toml)
+# cross-compiles the `dirsql` bin per target and stages it under
+# `dirsql/_binary/` before `maturin build`, so it ships inside each
+# wheel as package data. The directory is `.gitignore`d; not in
+# source control.
+include = [
+    { path = "dirsql/_binary/*", format = "wheel" },
+    { path = "docs/**/*", format = "sdist" },
+]
+manifest-path = "packages/python/Cargo.toml"
+
+# CLI launcher modules (`_cli/main.py`, `_cli/binary_path.py`,
+# `_cli/is_windows.py`) are thin shims that exec the bundled Rust
+# binary. The AGENTS.md test-boundary rules forbid monkeypatch unit
+# tests on production module attributes (`os.execv`, `binary_path`,
+# etc.) -- the only meaningful coverage is end-to-end (real wheel
+# install + `dirsql --version`), which putitoutthere's wheel-content
+# guard verifies post-build. Omitting these files keeps the 90%
+# coverage floor honest about library code.
+[tool.coverage.run]
+omit = [
+    "dirsql/_cli/*",
+]

dirsql-0.3.4/pyproject.toml

@@ -1,59 +0,0 @@
-[build-system]
-requires = ["maturin>=1.0,<2.0"]
-build-backend = "maturin"
-
-[project]
-name = "dirsql"
-# Maturin reads the version from `packages/python/Cargo.toml`'s
-# `[package].version` (see `dynamic = ["version"]`). Putitoutthere's
-# `write-version` step rewrites that literal before `maturin build` so
-# wheels ship at the planned version, not the literal on disk.
-dynamic = ["version"]
-description = "Ephemeral SQL index over a local directory"
-license = "MIT"
-requires-python = ">=3.10"
-authors = [
-    { name = "Kevin Scott" },
-]
-repository = "https://github.com/thekevinscott/dirsql"
-keywords = ["sql", "filesystem", "directory", "sqlite", "index"]
-readme = "README.md"
-
-[project.optional-dependencies]
-dev = [
-    "pytest>=8",
-    "pytest-describe>=2",
-    "pytest-asyncio>=0.23",
-    "pytest-cov>=5",
-    "ruff>=0.4",
-    "maturin>=1.0",
-]
-
-# [project.scripts] removed: the Rust CLI binary is no longer bundled
-# inside the PyPI wheel. Putitoutthere v0.2.3's `bundle_cli` recipe is
-# parsed but not yet wired into its reusable workflow's build job (no
-# cross-compile step reads `matrix.bundle_cli`). Restore the entry —
-#
-#   [project.scripts]
-#   dirsql = "dirsql._cli.main:main"
-#
-# — once the upstream gap is fixed and `[package.bundle_cli]` is
-# re-enabled in `putitoutthere.toml`. Until then, CLI install paths are
-# `cargo install dirsql --features cli` and `npx dirsql`.
-
-[tool.maturin]
-features = ["extension-module"]
-exclude = [
-    "tests/",
-]
-module-name = "dirsql._dirsql"
-# CI copies the release-built `dirsql` binary into
-# `python/dirsql/_binary/<name>` before `maturin build` so it ships
-# inside the wheel as package data. `.gitignore`d; not in source
-# control.
-include = [
-    { path = "python/dirsql/_binary/*", format = "wheel" },
-    { path = "docs/**/*", format = "sdist" },
-]
-manifest-path = "packages/python/Cargo.toml"
-python-source = "python"

dirsql-0.3.4/python/dirsql/_cli/binary_path_test.py

@@ -1,70 +0,0 @@
-"""Unit tests for ``binary_path``."""
-
-from __future__ import annotations
-
-import pytest
-
-from dirsql._cli import binary_path as mod
-
-
-class _FakeResource:
-    def __init__(self, path: str, exists: bool) -> None:
-        self._path = path
-        self._exists = exists
-
-    def is_file(self) -> bool:
-        return self._exists
-
-    def __str__(self) -> str:
-        return self._path
-
-
-class _FakeRoot:
-    def __init__(self, resource_path: str, exists: bool) -> None:
-        self.resource_path = resource_path
-        self.exists = exists
-        self.joinpath_calls: list[tuple[str, ...]] = []
-
-    def joinpath(self, *parts: str) -> _FakeResource:
-        self.joinpath_calls.append(parts)
-        return _FakeResource(self.resource_path, self.exists)
-
-
-def describe_binary_path():
-    def describe_on_unix():
-        def it_returns_the_resolved_dirsql_path(tmp_path, monkeypatch):
-            monkeypatch.setattr(mod, "is_windows", lambda: False)
-            binary = tmp_path / "dirsql"
-            binary.write_text("#!/bin/sh\nexit 0\n")
-
-            root = _FakeRoot(str(binary), exists=True)
-            monkeypatch.setattr(mod, "files", lambda _mod: root)
-
-            assert mod.binary_path() == str(binary)
-            assert root.joinpath_calls == [("_binary", "dirsql")]
-
-    def describe_on_windows():
-        def it_looks_for_dirsql_exe(tmp_path, monkeypatch):
-            monkeypatch.setattr(mod, "is_windows", lambda: True)
-            binary = tmp_path / "dirsql.exe"
-            binary.write_text("stub")
-
-            root = _FakeRoot(str(binary), exists=True)
-            monkeypatch.setattr(mod, "files", lambda _mod: root)
-
-            assert mod.binary_path() == str(binary)
-            assert root.joinpath_calls == [("_binary", "dirsql.exe")]
-
-    def describe_when_the_binary_is_missing():
-        def it_raises_FileNotFoundError_pointing_at_alternate_install_paths(
-            monkeypatch,
-        ):
-            monkeypatch.setattr(mod, "is_windows", lambda: False)
-            root = _FakeRoot("/does/not/exist", exists=False)
-            monkeypatch.setattr(mod, "files", lambda _mod: root)
-
-            with pytest.raises(FileNotFoundError) as exc:
-                mod.binary_path()
-            msg = str(exc.value)
-            assert "cargo install dirsql --features cli" in msg
-            assert "npx dirsql" in msg

dirsql-0.3.4/python/dirsql/_cli/is_windows_test.py

@@ -1,15 +0,0 @@
-"""Unit tests for ``is_windows``."""
-
-from __future__ import annotations
-
-from dirsql._cli import is_windows as mod
-
-
-def describe_is_windows():
-    def it_returns_false_on_posix(monkeypatch):
-        monkeypatch.setattr(mod, "os", type("_", (), {"name": "posix"})())
-        assert mod.is_windows() is False
-
-    def it_returns_true_on_nt(monkeypatch):
-        monkeypatch.setattr(mod, "os", type("_", (), {"name": "nt"})())
-        assert mod.is_windows() is True

dirsql-0.3.4/python/dirsql/_cli/main_test.py

@@ -1,77 +0,0 @@
-"""Unit tests for the ``main`` entry point."""
-
-from __future__ import annotations
-
-import os
-import subprocess
-import sys
-import types
-
-import pytest
-
-import dirsql._cli.main as mod
-
-
-def describe_main():
-    def describe_on_unix():
-        def it_execvs_and_forwards_argv(monkeypatch):
-            monkeypatch.setattr(mod, "is_windows", lambda: False)
-            monkeypatch.setattr(mod, "binary_path", lambda: "/fake/dirsql")
-
-            seen: dict[str, object] = {}
-
-            def fake_execv(path, args):
-                seen["path"] = path
-                seen["args"] = args
-                raise SystemExit(0)
-
-            monkeypatch.setattr(os, "execv", fake_execv)
-            with pytest.raises(SystemExit):
-                mod.main(["--port", "7117"])
-
-            assert seen["path"] == "/fake/dirsql"
-            assert seen["args"] == ["/fake/dirsql", "--port", "7117"]
-
-    def describe_on_windows():
-        def it_uses_subprocess_and_returns_the_child_exit_code(monkeypatch):
-            monkeypatch.setattr(mod, "is_windows", lambda: True)
-            monkeypatch.setattr(mod, "binary_path", lambda: "C:\\fake\\dirsql.exe")
-
-            seen: dict[str, object] = {}
-
-            def fake_run(cmd):
-                seen["cmd"] = cmd
-                return types.SimpleNamespace(returncode=42)
-
-            monkeypatch.setattr(subprocess, "run", fake_run)
-            code = mod.main(["serve"])
-            assert code == 42
-            assert seen["cmd"] == ["C:\\fake\\dirsql.exe", "serve"]
-
-    def describe_default_argv():
-        def it_falls_back_to_sys_argv_slice(monkeypatch):
-            monkeypatch.setattr(mod, "is_windows", lambda: False)
-            monkeypatch.setattr(mod, "binary_path", lambda: "/fake/dirsql")
-            monkeypatch.setattr(sys, "argv", ["dirsql", "hello"])
-
-            seen: dict[str, object] = {}
-
-            def fake_execv(path, args):
-                seen["args"] = args
-                raise SystemExit(0)
-
-            monkeypatch.setattr(os, "execv", fake_execv)
-            with pytest.raises(SystemExit):
-                mod.main(None)
-
-            assert seen["args"] == ["/fake/dirsql", "hello"]
-
-    def describe_when_the_binary_cannot_be_resolved():
-        def it_returns_1_and_writes_a_dirsql_prefixed_stderr(capsys, monkeypatch):
-            def raise_missing():
-                raise FileNotFoundError("bundled `dirsql` not found at /x")
-
-            monkeypatch.setattr(mod, "binary_path", raise_missing)
-            code = mod.main([])
-            assert code == 1
-            assert "dirsql: bundled `dirsql` not found" in capsys.readouterr().err