mmrelay 1.2.1__tar.gz → 1.2.2__tar.gz

{mmrelay-1.2.1/src/mmrelay.egg-info → mmrelay-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mmrelay
-Version: 1.2.1
+Version: 1.2.2
 Summary: Bridge between Meshtastic mesh networks and Matrix chat rooms
 Home-page: https://github.com/jeremiah-k/meshtastic-matrix-relay
 Author: Geoff Whittington, Jeremiah K., and contributors
@@ -23,15 +23,15 @@ Requires-Dist: Pillow==11.3.0
 Requires-Dist: matrix-nio==0.25.2
 Requires-Dist: matplotlib==3.10.1
 Requires-Dist: requests==2.32.5
-Requires-Dist: markdown==3.8.2
+Requires-Dist: markdown==3.9
 Requires-Dist: bleach==6.2.0
 Requires-Dist: haversine==2.9.0
 Requires-Dist: schedule==1.2.2
-Requires-Dist: platformdirs==4.3.8
+Requires-Dist: platformdirs==4.4.0
 Requires-Dist: py-staticmaps>=0.4.0
 Requires-Dist: psutil>=5.8.0
 Requires-Dist: rich==14.1.0
-Requires-Dist: setuptools==80.9.0
+Requires-Dist: setuptools>=80.9.0
 Provides-Extra: e2e
 Requires-Dist: matrix-nio[e2e]==0.25.2; extra == "e2e"
 Requires-Dist: python-olm; extra == "e2e"
@@ -48,7 +48,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# M<>M Relay
+# MMRelay
 
 ## (Meshtastic <=> Matrix Relay)
 
@@ -84,7 +84,7 @@ MMRelay supports multiple deployment methods including Docker, pip installation,
 
 ## Plugins
 
-M<>M Relay supports plugins for extending its functionality, enabling customization and enhancement of the relay to suit specific needs.
+MMRelay supports plugins for extending its functionality, enabling customization and enhancement of the relay to suit specific needs.
 
 ### Core Plugins
 
@@ -133,7 +133,7 @@ Plugins make it easy to extend functionality without modifying the core program.
 
 ## Getting Started with Matrix
 
-See our Wiki page [Getting Started With Matrix & MM Relay](https://github.com/jeremiah-k/meshtastic-matrix-relay/wiki/Getting-Started-With-Matrix-&-MM-Relay).
+See our Wiki page [Getting Started With Matrix & MMRelay](https://github.com/jeremiah-k/meshtastic-matrix-relay/wiki/Getting-Started-With-Matrix-&-MM-Relay).
 
 ---
 

{mmrelay-1.2.1 → mmrelay-1.2.2}/README.md

@@ -1,4 +1,4 @@
-# M<>M Relay
+# MMRelay
 
 ## (Meshtastic <=> Matrix Relay)
 
@@ -34,7 +34,7 @@ MMRelay supports multiple deployment methods including Docker, pip installation,
 
 ## Plugins
 
-M<>M Relay supports plugins for extending its functionality, enabling customization and enhancement of the relay to suit specific needs.
+MMRelay supports plugins for extending its functionality, enabling customization and enhancement of the relay to suit specific needs.
 
 ### Core Plugins
 
@@ -83,7 +83,7 @@ Plugins make it easy to extend functionality without modifying the core program.
 
 ## Getting Started with Matrix
 
-See our Wiki page [Getting Started With Matrix & MM Relay](https://github.com/jeremiah-k/meshtastic-matrix-relay/wiki/Getting-Started-With-Matrix-&-MM-Relay).
+See our Wiki page [Getting Started With Matrix & MMRelay](https://github.com/jeremiah-k/meshtastic-matrix-relay/wiki/Getting-Started-With-Matrix-&-MM-Relay).
 
 ---
 

{mmrelay-1.2.1 → mmrelay-1.2.2}/requirements.txt

@@ -3,20 +3,20 @@ Pillow==11.3.0
 matrix-nio==0.25.2
 matplotlib==3.10.1
 requests==2.32.5
-markdown==3.8.2
+markdown==3.9
 bleach==6.2.0
 haversine==2.9.0
 schedule==1.2.2
-platformdirs==4.3.8
+platformdirs==4.4.0
 py-staticmaps>=0.4.0
 psutil>=5.8.0
 rich==14.1.0
-setuptools==80.9.0
+setuptools>=80.9.0  # Required for console script entry points and Windows compatibility
 
 # Testing and coverage
-coverage==7.10.5
-pytest==8.4.1
-pytest-cov==6.2.1
-pytest-asyncio==1.1.0
+coverage==7.10.7
+pytest==8.4.2
+pytest-cov==6.3.0
+pytest-asyncio==1.2.0
 pytest-env==1.1.5
 pytest-timeout==2.4.0

{mmrelay-1.2.1 → mmrelay-1.2.2}/setup.py

@@ -49,15 +49,15 @@ setup(
         "matrix-nio==0.25.2",
         "matplotlib==3.10.1",
         "requests==2.32.5",
-        "markdown==3.8.2",
+        "markdown==3.9",
         "bleach==6.2.0",
         "haversine==2.9.0",
         "schedule==1.2.2",
-        "platformdirs==4.3.8",
+        "platformdirs==4.4.0",
         "py-staticmaps>=0.4.0",
         "psutil>=5.8.0",
         "rich==14.1.0",
-        "setuptools==80.9.0",
+        "setuptools>=80.9.0",  # Required for console script entry points and Windows compatibility
     ],
     extras_require={
         "e2e": [
@@ -68,6 +68,6 @@ setup(
     packages=find_packages(where="src"),
     package_dir={"": "src"},
     include_package_data=True,
-    package_data={"mmrelay.tools": ["sample_config.yaml"]},
+    package_data={"mmrelay.tools": ["sample_config.yaml", "mmrelay.service"]},
     entry_points={"console_scripts": ["mmrelay = mmrelay.cli:main"]},
 )

{mmrelay-1.2.1 → mmrelay-1.2.2}/src/mmrelay/__init__.py

@@ -2,4 +2,4 @@
 Meshtastic Matrix Relay - Bridge between Meshtastic mesh networks and Matrix chat rooms.
 """
 
-__version__ = "1.2.1"
+__version__ = "1.2.2"

mmrelay-1.2.2/src/mmrelay/__main__.py

@@ -0,0 +1,29 @@
+"""
+Alternative entry point for MMRelay that doesn't rely on setuptools console scripts.
+
+This can be used as a fallback on Windows systems where the setuptools-generated
+console script fails due to missing pkg_resources.
+
+Usage:
+    python -m mmrelay [args...]
+"""
+
+import sys
+
+if __name__ == "__main__":
+    try:
+        from mmrelay.cli import main
+
+        sys.exit(main())
+    except ImportError as e:
+        print(f"Error importing MMRelay CLI: {e}", file=sys.stderr)
+        print("Please ensure MMRelay is properly installed.", file=sys.stderr)
+        sys.exit(1)
+    except KeyboardInterrupt:
+        print("Interrupted.", file=sys.stderr)
+        sys.exit(130)
+    except SystemExit:
+        raise
+    except Exception as e:
+        print(f"Unexpected error: {e}", file=sys.stderr)
+        sys.exit(1)