Skip to content

Commit

Permalink
slog depends on powermon, so move it within the optional block as well
Browse files Browse the repository at this point in the history
  • Loading branch information
ianmcorvidae committed Aug 11, 2024
1 parent b8c0a62 commit 6757f5c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion meshtastic/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
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
Expand Down
2 changes: 1 addition & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit 6757f5c

Please sign in to comment.