diskstore 0.3.1__tar.gz → 0.4.0__tar.gz

diskstore-0.4.0/LICENSE.txt

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2025-2026 Wolfgang Langner
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

{diskstore-0.3.1 → diskstore-0.4.0}/PKG-INFO

@@ -1,16 +1,18 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: diskstore
-Version: 0.3.1
+Version: 0.4.0
 Summary: Simple MutableMapping compatible SQLite based disk storage.
 Author: tds333
 Author-email: tds333 <tds333@mailbox.org>
+License-Expression: BSD-3-Clause
+License-File: LICENSE.txt
 Requires-Dist: apsw>=3.51.3
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 
 # DiskStore Sqlite based disk store
 
-`DiskStore` is an Apache2/MIT licensed disk storage library, written
+`DiskStore` is a BSD-3-Clause licensed disk storage library, written
 in pure Python.
 
 Inspired by DiskCache library it implements a MutableMapping compatible sqlite
@@ -85,16 +87,7 @@ faster sqlite library apsw with up to date sqlite library version.
 License
 -------
 
-Copyright 2025-2026 Wolfgang Langner
-
-Licensed under the Apache License, Version 2.0 (the "License") or MIT; you may not use
-this file except in compliance with the License.  You may obtain a copy of the
-License at
+`DiskStore` is distributed under the terms of the
+[BSD-3-Clause](https://spdx.org/licenses/BSD-3-Clause.html) license.
 
-    http://www.apache.org/licenses/LICENSE-2.0
-    https://mit-license.org/
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
+Copyright 2025-2026 Wolfgang Langner

{diskstore-0.3.1 → diskstore-0.4.0}/README.md

@@ -1,6 +1,6 @@
 # DiskStore Sqlite based disk store
 
-`DiskStore` is an Apache2/MIT licensed disk storage library, written
+`DiskStore` is a BSD-3-Clause licensed disk storage library, written
 in pure Python.
 
 Inspired by DiskCache library it implements a MutableMapping compatible sqlite
@@ -75,16 +75,7 @@ faster sqlite library apsw with up to date sqlite library version.
 License
 -------
 
-Copyright 2025-2026 Wolfgang Langner
-
-Licensed under the Apache License, Version 2.0 (the "License") or MIT; you may not use
-this file except in compliance with the License.  You may obtain a copy of the
-License at
+`DiskStore` is distributed under the terms of the
+[BSD-3-Clause](https://spdx.org/licenses/BSD-3-Clause.html) license.
 
-    http://www.apache.org/licenses/LICENSE-2.0
-    https://mit-license.org/
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
+Copyright 2025-2026 Wolfgang Langner

diskstore-0.4.0/pyproject.toml

@@ -0,0 +1,80 @@
+[project]
+name = "diskstore"
+version = "0.4.0"
+description = "Simple MutableMapping compatible SQLite based disk storage."
+readme = "README.md"
+license = "BSD-3-Clause"
+license-files = ["LICENSE.txt"]
+requires-python = ">=3.10"
+dependencies = ["apsw>=3.51.3"]
+
+[[project.authors]]
+name = "tds333"
+email = "tds333@mailbox.org"
+
+[dependency-groups]
+dev = [
+    "msgspec>=0.20.0",
+    "pydantic>=2.12.5,<=2.99.99b0",
+    "pytest",
+    "pytest-asyncio>=1.3.0",
+    "pytest-cov",
+    "pytest-examples>=0.0.18",
+    "pytest-xdist",
+    "structtype>=0.8.1",
+]
+docs = [
+    "mkdocstrings[python]>=1.0.3",
+    "zensical>=0.0.23",
+]
+
+[build-system]
+requires = ["uv_build>=0.9.2,<1"]
+build-backend = "uv_build"
+
+[tool.coverage.run]
+parallel = true
+branch = true
+source = ["diskstore"]
+
+[tool.coverage.report]
+show_missing = true
+skip_covered = true
+exclude_lines = [
+    "no cov",
+    "if __name__ == .__main__.:",
+    "if TYPE_CHECKING:",
+]
+
+[tool.pytest]
+testpaths = ["tests"]
+
+[tool.ruff]
+exclude = [
+    ".env",
+    ".venv",
+    "venv",
+]
+line-length = 88
+
+[tool.ruff.lint]
+select = [
+    "E",
+    "W",
+    "F",
+    "I",
+    "C",
+    "B",
+    "PT",
+    "N",
+    "PL",
+    "RUF",
+]
+ignore = [
+    "B008",
+    "C901",
+    "RET504",
+    "PLR2004",
+]
+
+[tool.uv]

diskstore-0.3.1/pyproject.toml → diskstore-0.4.0/pyproject.toml.orig

@@ -1,8 +1,10 @@
 [project]
 name = "diskstore"
-version = "0.3.1"
+version = "0.4.0"
 description = "Simple MutableMapping compatible SQLite based disk storage."
 readme = "README.md"
+license = "BSD-3-Clause"
+license-files = ["LICENSE.txt"]
 requires-python = ">=3.10"
 authors = [{ name = "tds333", email = "tds333@mailbox.org" }]
 dependencies = ["apsw>=3.51.3"]
@@ -15,7 +17,8 @@ dev = [
   "pytest-asyncio>=1.3.0",
   "pytest-cov",
   "pytest-examples>=0.0.18",
-  "pytest-xdist"
+  "pytest-xdist",
+  "structtype>=0.8.1",
 ]
 docs = [
   "mkdocstrings[python]>=1.0.3",
@@ -67,4 +70,4 @@ ignore = [
 ]
 
 [tool.uv]
-exclude-newer = "1 days"
+#exclude-newer = "1 days"

{diskstore-0.3.1 → diskstore-0.4.0}/src/diskstore/config.py

@@ -245,3 +245,31 @@ class PydanticConfig(BaseConfig):
 
     def load_data(self, data: tuple) -> Any:
         return self.model.model_validate_json(data[1])
+
+
+class StructtypeConfig(BaseConfig):
+    def __init__(  # noqa: PLR0913, PLR0917
+        self,
+        struct,
+        tablename=None,
+        key_type=None,
+        timeout=None,
+        pragmas=None,
+        auto_migrate=None,
+    ):
+        tablename = struct.__name__ if not tablename else tablename
+        super().__init__(
+            tablename=tablename,
+            key_type=key_type,
+            timeout=timeout,
+            pragmas=pragmas,
+            auto_migrate=auto_migrate,
+        )
+        self.fields = (("value", "BLOB", NO_DEFAULT),)
+        self.struct = struct
+
+    def dump_value(self, key: KeyType | None, value: Any) -> Sequence:
+        return (key, value.struct_dump_json())
+
+    def load_data(self, data: tuple) -> Any:
+        return self.struct.struct_validate_json(data[1])

{diskstore-0.3.1 → diskstore-0.4.0}/src/diskstore/diskstore.py

@@ -97,7 +97,7 @@ class DiskStore(DiskRead, MutableMapping):
             # apply them all on fresh connection
             for key, value in self._pragmas.items():
                 con.pragma(key, value)
-            self.migrate_table(con, self._config)
+            self._migrate_table(con, self._config)
             self._local.con = con
 
         return con
@@ -117,7 +117,7 @@ class DiskStore(DiskRead, MutableMapping):
         return field_create
 
     @staticmethod
-    def migrate_table(con: Connection, config: ConfigProtocol) -> None:
+    def _migrate_table(con: Connection, config: ConfigProtocol) -> None:
         """Ensure the table exists, optionally migrating to match config.fields.
 
         If the table does not exist it is created from *config*.  If