mmrelay 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

mmrelay/__init__.py

@@ -2,12 +2,17 @@
 Meshtastic Matrix Relay - Bridge between Meshtastic mesh networks and Matrix chat rooms.
 """
 
-import importlib.metadata
 import os
 
-# Try to get version from package metadata (setup.cfg)
-try:
-    __version__ = importlib.metadata.version("mmrelay")
-except importlib.metadata.PackageNotFoundError:
-    # If package is not installed, fall back to environment variable or default
-    __version__ = os.environ.get("GITHUB_REF_NAME", "1.0.1")
+import pkg_resources
+
+# First try to get version from environment variable (GitHub tag)
+if "GITHUB_REF_NAME" in os.environ:
+    __version__ = os.environ.get("GITHUB_REF_NAME")
+else:
+    # Fall back to setup.cfg metadata using pkg_resources (compatible with PyInstaller)
+    try:
+        __version__ = pkg_resources.get_distribution("mmrelay").version
+    except pkg_resources.DistributionNotFound:
+        # If all else fails, use hardcoded version
+        __version__ = "1.0.1"

mmrelay/main.py

@@ -37,6 +37,7 @@ logging.getLogger("nio").setLevel(logging.ERROR)
 # Flag to track if banner has been printed
 _banner_printed = False
 
+
 def print_banner():
     """Print a simple startup message with version information."""
     global _banner_printed

mmrelay/meshtastic_utils.py

@@ -2,7 +2,6 @@ import asyncio
 import contextlib
 import io
 import os
-import sys
 import threading
 import time
 from typing import List
@@ -279,7 +278,13 @@ async def reconnect():
 
                 # Show reconnection countdown with Rich (if not in a service)
                 if not is_running_as_service():
-                    from rich.progress import Progress, TextColumn, BarColumn, TimeRemainingColumn
+                    from rich.progress import (
+                        BarColumn,
+                        Progress,
+                        TextColumn,
+                        TimeRemainingColumn,
+                    )
+
                     with Progress(
                         TextColumn("[cyan]Meshtastic: Reconnecting in"),
                         BarColumn(),

mmrelay/setup_utils.py

@@ -52,6 +52,7 @@ def print_service_commands():
 def wait_for_service_start():
     """Wait for the service to start with a Rich progress indicator."""
     import time
+
     from rich.progress import Progress, SpinnerColumn, TextColumn, TimeElapsedColumn
 
     # Create a Rich progress display with spinner and elapsed time

{mmrelay-1.0.1.dist-info → mmrelay-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mmrelay
-Version: 1.0.1
+Version: 1.0.3
 Summary: Bridge between Meshtastic mesh networks and Matrix chat rooms
 Home-page: https://github.com/geoffwhittington/meshtastic-matrix-relay
 Author: Geoff Whittington, Jeremiah K., and contributors

{mmrelay-1.0.1.dist-info → mmrelay-1.0.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
-mmrelay/__init__.py,sha256=rJqoGfYDKTqEyyzrpQDpwRPfFCDG90XnhGUSHzttjPo,440
+mmrelay/__init__.py,sha256=8fghAZAeSUb8uIaiit0FGNUWI0ZsBR__QbXNwqNbGtw,588
 mmrelay/cli.py,sha256=yBYOkCwGYDJ2gRKPoPltxB_PydX1CPNUerVJHcNuHTo,12355
 mmrelay/config.py,sha256=OIDxQStuVHyWxsDfnKqt0rr26ETEoZPqHVXReEH3IG8,7006
 mmrelay/config_checker.py,sha256=UnoHVTXzfdTfFkbmXv9r_Si76v-sxXLb5FOaQSOM45E,4909
 mmrelay/db_utils.py,sha256=DP2YuKBZtV771wo9X-Z7Ww5txfaIR0inWh1K_oVZ7cA,11430
 mmrelay/log_utils.py,sha256=FXhaq4WSDHwlqiG3k1BbSxiOl5be4P4Kyr1gsIThOBw,4572
-mmrelay/main.py,sha256=Okiat89uWiOrn5wq7lvJinYP3C6wzKdlQsyLxB8cCmI,11084
+mmrelay/main.py,sha256=acgBF-DnL0Rs8MmYAfbNHZ9xjqM3Qc0_oKtATN4iOEE,11085
 mmrelay/matrix_utils.py,sha256=GkIVj2bbPHtx1emFMwhEhc1SWHcv4UvkuyZYdb-Wnwo,30511
-mmrelay/meshtastic_utils.py,sha256=ha6wRYeU16wT8jkZlr7RjnsB1b9e276cgu0jw4vmdbw,23270
+mmrelay/meshtastic_utils.py,sha256=Pd0j7mz008ncBDIjRGyHOIb0U3vKq06uXWoJP-csHcQ,23381
 mmrelay/plugin_loader.py,sha256=QfSXu4nxxBL_pGttLJGzGki8kRtWbFdtSoD_Qnx2iqU,12758
-mmrelay/setup_utils.py,sha256=MWBrpf9lNlw21yOoyFhzz1DSJx2KMTzZIMcHS3MwcdM,14090
+mmrelay/setup_utils.py,sha256=GHttNLoqPwOpjSly0osaCnotPxCq0hfyopsZ2qq313A,14091
 mmrelay/plugins/__init__.py,sha256=KVMQIXRhe0wlGj4O3IZ0vOIQRKFkfPYejHXhJL17qrc,51
 mmrelay/plugins/base_plugin.py,sha256=7tBIARWp9Qc4iAEMcsKiUJh1cbqXHcXAk4dlu1b8SBg,7524
 mmrelay/plugins/debug_plugin.py,sha256=Jziht9Nj_bRO6Rmy7TjfBXaYo5eM3XsenbWFxPpyUs4,443
@@ -21,9 +21,9 @@ mmrelay/plugins/nodes_plugin.py,sha256=RDabzyG5hKG5aYWecsRUcLSjMCCv6Pngmq2Qpld1A
 mmrelay/plugins/ping_plugin.py,sha256=RTRdgDQUSO33lreDTmWsTlI0L1C3FJrXE0KYqfEWYO0,4017
 mmrelay/plugins/telemetry_plugin.py,sha256=8SxWv4BLXMUTbiVaD3MjlMMdQyS7S_1OfLlVNAUMSO0,6306
 mmrelay/plugins/weather_plugin.py,sha256=yoKA_HdFqFEhgYdXqLhvXatLphCyLJFuGUKCR7fILv0,8546
-mmrelay-1.0.1.dist-info/licenses/LICENSE,sha256=yceWauM1c0-FHxVplsD7W1-AbSeRaUNlmqT4UO1msBU,1073
-mmrelay-1.0.1.dist-info/METADATA,sha256=WziSMZeJluF69VwTLtCuxGvGtFxbAcumZV4iOAEWWTg,6953
-mmrelay-1.0.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-mmrelay-1.0.1.dist-info/entry_points.txt,sha256=SJZwGUOEpQ-qx4H8UL4xKFnKeInGUaZNW1I0ddjK7Ws,45
-mmrelay-1.0.1.dist-info/top_level.txt,sha256=B_ZLCRm7NYAmI3PipRUyHGymP-C-q16LSeMGzmqJfo4,8
-mmrelay-1.0.1.dist-info/RECORD,,
+mmrelay-1.0.3.dist-info/licenses/LICENSE,sha256=yceWauM1c0-FHxVplsD7W1-AbSeRaUNlmqT4UO1msBU,1073
+mmrelay-1.0.3.dist-info/METADATA,sha256=u2oPLnidTXciajKZyZuk28FaNTYL-Z_JygobFBJwm3I,6953
+mmrelay-1.0.3.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+mmrelay-1.0.3.dist-info/entry_points.txt,sha256=SJZwGUOEpQ-qx4H8UL4xKFnKeInGUaZNW1I0ddjK7Ws,45
+mmrelay-1.0.3.dist-info/top_level.txt,sha256=B_ZLCRm7NYAmI3PipRUyHGymP-C-q16LSeMGzmqJfo4,8
+mmrelay-1.0.3.dist-info/RECORD,,