slog depends on powermon, so move it within the optional block as well

This commit is contained in:
Ian McEwen
2024-08-11 10:16:22 -07:00
parent b8c0a62b27
commit 6757f5cdb5
3 changed files with 5 additions and 5 deletions

View File

@@ -31,13 +31,13 @@ try:
RidenPowerSupply,
SimPowerSupply,
)
from meshtastic.slog import LogSet
have_powermon = True
powermon_exception = None
except ImportError as e:
have_powermon = False
powermon_exception = e
from meshtastic.protobuf import channel_pb2, config_pb2, portnums_pb2
from meshtastic.slog import LogSet
from meshtastic.version import get_active_version
meter: Optional[PowerMeter] = None

2
poetry.lock generated
View File

@@ -4157,4 +4157,4 @@ tunnel = ["pytap2"]
[metadata]
lock-version = "2.0"
python-versions = "^3.9,<3.13"
content-hash = "66b7938a3260be05efac7e73d4dd336100e898d092951e644497f5d944fa8278"
content-hash = "aa66d6081174b6f17b907b29c6ef0e5cc7088696154cf1f40ce99eb1b4c172f3"

View File

@@ -21,9 +21,6 @@ pyyaml = "^6.0.1"
pypubsub = "^4.0.3"
bleak = "^0.21.1"
packaging = "^24.0"
parse = "^1.20.2"
pyarrow = "^16.1.0"
platformdirs = "^4.2.2"
print-color = "^0.4.6"
dash = { version = "^2.17.1", optional = true }
pytap2 = { version = "^2.3.0", optional = true }
@@ -54,6 +51,9 @@ optional = true
[tool.poetry.group.powermon.dependencies]
riden = { git = "https://github.com/geeksville/riden.git#1.2.1" }
ppk2-api = "^0.9.2"
parse = "^1.20.2"
pyarrow = "^16.1.0"
platformdirs = "^4.2.2"
# If you are doing power analysis you might want these extra devtools
[tool.poetry.group.analysis]