moat-kv 0.70.15__tar.gz → 0.70.19__tar.gz

{moat-kv-0.70.15 → moat-kv-0.70.19}/.gitmodules

@@ -16,3 +16,6 @@
 [submodule "moat-kv-akumuli"]
 	path = ext/akumuli
 	url = git://git.smurf.noris.de/moat-kv-akumuli.git
+[submodule "ext/wago"]
+	path = ext/wago
+	url = git://git.smurf.noris.de/moat-kv-wago.git

{moat-kv-0.70.15 → moat-kv-0.70.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moat-kv
-Version: 0.70.15
+Version: 0.70.19
 Summary: A distributed no-master key-value store
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org

{moat-kv-0.70.15 → moat-kv-0.70.19}/moat/kv/__init__.py

@@ -3,10 +3,13 @@
 __path__ = __import__("pkgutil").extend_path(__path__, __name__)
 
 try:
+    import warning
     import pkg_resources  # part of setuptools
 
-    _version = pkg_resources.require("moat.kv")[0].version
+    with warnings.filterwarnings("ignore"):
+        _version = pkg_resources.require("moat.kv")[0].version
     del pkg_resources
+    del warnings
 
     _version_tuple = tuple(int(x) for x in _version.split("."))
 

{moat-kv-0.70.15 → moat-kv-0.70.19}/moat/kv/client.py

@@ -535,6 +535,7 @@ class Client:
 
             except BaseException as exc:
                 logger.warning("Reader died: %r", exc, exc_info=exc)
+                raise
             finally:
                 with anyio.fail_after(2, shield=True):
                     hdl, self._handlers = self._handlers, None

{moat-kv-0.70.15 → moat-kv-0.70.19}/moat/kv/mock/__init__.py

@@ -93,5 +93,5 @@ class S:
                 args = args.split(" ")
         async with scope.using_scope():
             return await run(
-                "-v", "-v", "kv", "-h", h, "-p", p, *args, do_stdout=do_stdout
+                "-VV", "kv", "-h", h, "-p", p, *args, do_stdout=do_stdout
             )

{moat-kv-0.70.15 → moat-kv-0.70.19}/moat/kv/runner.py

@@ -168,33 +168,33 @@ class CallAdmin:
     async def _run2(self, code, data):
         """Called by the runner to actually execute the code."""
         self._logger.debug("Start %s with %s", self._runner._path, self._runner.code)
-        async with anyio.create_task_group() as tg:
+        async with (
+                anyio.create_task_group() as tg,
+                AsyncExitStack() as stack,
+                ):
+            self._stack = stack
             self._taskgroup = tg
-            async with AsyncExitStack() as stack:
-                self._stack = stack
-                sc = tg.cancel_scope
+            self._runner.scope = sc = tg.cancel_scope
 
-                self._taskgroup = tg
-                self._runner.scope = sc
-                data["_self"] = self
+            data["_self"] = self
 
-                oka = getattr(self._runner, "ok_after", 0)
-                if oka > 0:
+            oka = getattr(self._runner, "ok_after", 0)
+            if oka > 0:
 
-                    async def is_ok(oka):
-                        await anyio.sleep(oka)
-                        await self.setup_done()
+                async def is_ok(oka):
+                    await anyio.sleep(oka)
+                    await self.setup_done()
 
-                    tg.start_soon(is_ok, oka)
-                tg.start_soon(self._changed_code, code)
+                tg.start_soon(is_ok, oka)
+            tg.start_soon(self._changed_code, code)
 
-                await self._runner.send_event(ReadyMsg(0))
-                res = code(**data)
-                if code.is_async is not None:
-                    res = await res
+            await self._runner.send_event(ReadyMsg(0))
+            res = code(**data)
+            if code.is_async is not None:
+                res = await res
 
-                sc.cancel()
-                return res
+            sc.cancel()
+            return res
 
     async def _pinger(self):
         t = self._runner.ok_after or 10
@@ -556,7 +556,7 @@ class RunnerEntry(AttrClientEntry):
                     raise RuntimeError(f"already running on {state.node}")
                 code = self.root.code.follow(self.code, create=False)
                 data = combine_dict(
-                    self.data or {}, code.value.get("default", {}), deep=True
+                    self.data or {}, {} if code.value is NotGiven else code.value.get("default", {}), deep=True
                 )
 
                 if code.is_async:
@@ -793,7 +793,10 @@ class StateEntry(AttrClientEntry):
             await self.delete()
             return
 
-        if self.node is None or self.node != self.root.name:
+        if self.node is None:
+            return
+        if self.node != self.root.name:
+            self.root.runner.get_node(self.node)
             return
 
         self.stopped = time.time()
@@ -1173,7 +1176,7 @@ class AnyRunnerRoot(_BaseRunnerRoot):
         self._stale_times.append(cur)
         if self._stale_times[0] > cur - self.max_age:
             return
-        if len(self._stale_times) < 5:
+        if len(self._stale_times) <= 2*self._cfg["actor"]["n_hosts"]+1:
             return
         cut = self._stale_times.pop(0)
 

{moat-kv-0.70.15 → moat-kv-0.70.19}/moat_kv.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moat-kv
-Version: 0.70.15
+Version: 0.70.19
 Summary: A distributed no-master key-value store
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org

{moat-kv-0.70.15 → moat-kv-0.70.19}/moat_kv.egg-info/requires.txt

@@ -1,10 +1,10 @@
 PyNaCl>=1.3
-anyio>=3
-asyncactor>=0.21
+anyio>=4
+asyncactor>=0.24
 asyncclick>7.99
 asyncscope>=0.10.4
 asyncserf>=0.16
-attrs>=20
+attrs>=22
 jsonschema>=2.5
 moat-lib-diffiehellman~=0.13.1.6
 moat-mqtt~=0.39.4
@@ -13,7 +13,7 @@ psutil
 range_set>=0.2
 ruyaml>=0.89
 simpleeval>=0.9.10
-trio>=0.18
+trio>=0.22
 
 [:python_version < "3.11"]
 exceptiongroup

{moat-kv-0.70.15 → moat-kv-0.70.19}/pyproject.toml

@@ -20,12 +20,12 @@ classifiers = [
 ]
 dependencies = [
 	"asyncclick > 7.99",        
-	"trio >= 0.18",
-	"anyio >= 3",
+	"trio >= 0.22",
+	"anyio >= 4",
 	"range_set >= 0.2",                                                          
-	"attrs >= 20",
+	"attrs >= 22",
 	"asyncserf >= 0.16",   
-	"asyncactor >= 0.21",
+	"asyncactor >= 0.24",
 	"asyncscope >= 0.10.4",   
 	"jsonschema >= 2.5",
 	"ruyaml >= 0.89",
@@ -60,6 +60,33 @@ file = "LICENSE.txt"
 homepage = "https://m-o-a-t.org"
 repository = "https://github.com/M-o-a-T/moat-kv"
 
+[tool.ruff]
+select = ["ALL"]
+ignore = ["ANN","PTH","PERF", "D105", "D107","A003","S101","RUF001","RUF002","PLW1514", "D2","D3","D4","T2","FBT","TRY003","EM10","PLR","C","RET50","TD","FIX","N","ERA","BLE001","COM812","ISC001"]
+
+preview = true
+explicit-preview-rules = true
+
+line-length = 99
+
+[tool.ruff.flake8-comprehensions]
+allow-dict-calls-with-keyword-arguments = true
+
+[tool.ruff.flake8-builtins]
+builtins-ignorelist = ["id","help"]
+
+[tool.ruff.isort]
+no-lines-before = ["future"]
+required-imports = ["from __future__ import annotations"]
+section-order = ["future","standard-library","first-party","third-party","moat","local-folder","upy","typing"]
+extra-standard-library = ["pytest", "anyio"]
+force-to-top = ["moat.util"]
+
+[tool.ruff.isort.sections]
+"moat" = ["moat"]
+"upy" = ["micropython", "machine", "esp"]
+"typing" = ["typing"]
+
 [tool.flake8]
 max-line-length = 99
 ignore = [ "F841", "F401", "E731", "E502", "E402", "E127", "E123", "W503", "E231", "E203", "E501" ]

{moat-kv-0.70.15 → moat-kv-0.70.19}/scripts/init

@@ -28,7 +28,7 @@ if test "$MODE" != "slave" ; then
 
     if test ! -s "0.dkv" ; then
         moat kv dump init $NAME 0.dkv
-        chown -R moat-kv:moat "$DEST"
+        chown -R MoaT-KV:MoaT "$DEST"
     fi
 fi