meshbench 0.0.9__tar.gz → 0.0.11.dev2__tar.gz

{meshbench-0.0.9 → meshbench-0.0.11.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: meshbench
-Version: 0.0.9
+Version: 0.0.11.dev2
 Summary: Drive a MeshBench workbench: RF-accurate MeshCore simulation, from Python
 Project-URL: Homepage, https://github.com/MeshBench/meshbench
 Project-URL: Issues, https://github.com/MeshBench/meshbench/issues

{meshbench-0.0.9 → meshbench-0.0.11.dev2}/meshbench/__init__.py

@@ -154,4 +154,4 @@ __all__ = [
     "default_socket_path",
 ]
 
-__version__ = "0.0.9"
+__version__ = "0.0.11.dev2"

{meshbench-0.0.9 → meshbench-0.0.11.dev2}/meshbench/live.py

@@ -3,8 +3,8 @@
 Four steps in a fixed order, and every one of them has been skipped by somebody
 at least once. The two that get missed are the last two, and missing them does
 not fail: the mesh comes up with regions inferred but never applied, which
-transmits everything, relays nothing, and reports no error at all. It reads as
-bad RF.
+relays every advert, drops every scoped message without a word, and reports no
+error at all. It reads as bad RF.
 
 So the steps are here individually, because sometimes you want to look at a
 preview before committing - and ``pull`` runs all four, because the ordinary
@@ -100,8 +100,9 @@ class Live:
     ) -> None:
         """Read the feed's recent traffic to work out what each node holds.
 
-        This is the step that decides whether anything relays. A node whose
-        regions are unknown forwards nothing, and nothing says so.
+        This is the step that decides whether scoped traffic relays. A node
+        whose regions are unknown still relays every unscoped flood, drops
+        every scoped packet, and nothing says so.
 
         ``window`` is the feed's own past; ``wait`` is how long you will sit
         here for it. A week of ScotMesh is around 150,000 packets and several

{meshbench-0.0.9 → meshbench-0.0.11.dev2}/meshbench/pairing.py

@@ -13,7 +13,7 @@ from __future__ import annotations
 
 
 def release() -> str:
-    """The release this client belongs to, as PyPI spells it.
+    """The release this client belongs to, as the workbench spells it.
 
     Read from ``__version__`` rather than kept here, because the release
     workflow stamps that one line and a second copy would be a second thing to
@@ -23,10 +23,26 @@ def release() -> str:
     A checkout carries whatever ``__version__`` last said, which is the previous
     release. That is not worth guarding against: a workbench built from the same
     checkout carries no release at all, so the pair is never compared.
+
+    PyPI spells a development build ``0.0.11.dev1`` where the tag, and the
+    workbench stamped from it, say ``0.0.11-dev.1``. The wire carries the tag's
+    spelling, so the workbench compares one spelling against itself rather than
+    refusing the client that was published for it.
     """
     from meshbench import __version__
 
-    return __version__
+    return tag_spelling(__version__)
+
+
+def tag_spelling(version: str) -> str:
+    """PEP 440's ``X.Y.Z.devN`` as the tag spells it, ``X.Y.Z-dev.N``.
+
+    Anything else, a plain release included, is returned as it came.
+    """
+    base, dot, dev = version.rpartition(".dev")
+    if dot and base and dev.isdigit():
+        return f"{base}-dev.{dev}"
+    return version
 
 
 def paired_release(ours: str, theirs: str) -> bool:

{meshbench-0.0.9 → meshbench-0.0.11.dev2}/tests/test_client.py

@@ -274,6 +274,21 @@ def test_the_pairing_rule_is_exact_match_or_an_unstamped_end():
     assert "skipped" in meshbench.pairing_note("1.0.0", "")
 
 
+def test_a_development_client_speaks_the_tags_spelling():
+    """PyPI spells the development client 0.0.11.dev1 and the workbench stamped
+    from the tag says 0.0.11-dev.1. The first development cut had no client at
+    all; the second must not be refused for spelling its own number the way
+    its index does."""
+    assert meshbench.pairing.tag_spelling("0.0.11.dev1") == "0.0.11-dev.1"
+    assert meshbench.pairing.tag_spelling("0.0.11") == "0.0.11"
+    assert meshbench.pairing.tag_spelling("") == ""
+    # Only a numeric .devN is a development build; anything odder is left alone.
+    assert meshbench.pairing.tag_spelling("0.0.11.devx") == "0.0.11.devx"
+    assert meshbench.paired_release(
+        meshbench.pairing.tag_spelling("0.0.11.dev1"), "0.0.11-dev.1"
+    )
+
+
 def test_a_release_refusal_keeps_the_workbenchs_own_words():
     said = (
         "this client is from MeshBench 1.5.0 and this workbench is MeshBench "