From ea5608da6aef0ae2f824637adb05e0d480278719 Mon Sep 17 00:00:00 2001 From: y2kmeltdown Date: Mon, 5 May 2025 22:12:17 +1000 Subject: [PATCH 1/2] Updated requirements to work with meshtastic 2.6.2 --- requirements.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 28fdbb2..eb162f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,9 +18,9 @@ itsdangerous==2.1.2 Jinja2==3.1.2 jsonschema==4.17.3 MarkupSafe==2.1.1 -meshtastic==2.0.6 +meshtastic==2.6.2 mypy-extensions==0.4.3 -packaging==22.0 +packaging==24.0 pathspec==0.10.3 pexpect==4.8.0 platformdirs==2.6.0 @@ -35,14 +35,14 @@ pyserial==3.5 pytest==7.2.0 pytest-cov==4.0.0 pytz==2022.7 -PyYAML==6.0 -requests==2.29.0 +PyYAML==6.0.2 +requests==2.32.3 requests-mock==1.10.0 six==1.16.0 tabulate==0.9.0 timeago==1.0.16 tomli==2.0.1 -typing_extensions==4.4.0 +typing_extensions==4.13.2 urllib3==1.26.15 Werkzeug==2.2.2 zipp==3.11.0 From a2ff64aedb88663fa8ad6b7034b9798af4575dd2 Mon Sep 17 00:00:00 2001 From: Damien Rice <44934900+Y2Kmeltdown@users.noreply.github.com> Date: Tue, 6 May 2025 16:00:34 +1000 Subject: [PATCH 2/2] Update conftest.py Updating test to point to correct protobuf file --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 94d32a0..e727561 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -7,7 +7,7 @@ from meshtastic.serial_interface import SerialInterface from meshtastic.mesh_interface import MeshInterface from meshtastic.node import Node -from meshtastic.channel_pb2 import Channel +from meshtastic.protobuf.channel_pb2 import Channel import pytest # custom