Skip to content

Commit

Permalink
Merge branch 'dev' into 0.80.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	mpf/core/text_ui.py
  • Loading branch information
avanwinkle committed Nov 22, 2024
2 parents 5689953 + f98c2e2 commit 48fbc17
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mpf/core/text_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,8 @@ def _update_machine_vars(self, **kwargs):
machine_vars = self.machine.variables.machine_vars
# If config defines explict vars to show, only show those.
# Otherwise, filter out the unhelpful defaults
names = self.config.get('machine_vars', [
n for n in machine_vars.keys() if not (n.startswith("audits") or n.startswith("platform") or n.startswith("mpf"))
names = self.config.get('machine_vars', [n for n in machine_vars.keys() if not (
n.startswith("audits") or n.startswith("platform") or n.startswith("mpf"))
])
for name in names:
self._machine_widgets.append(Label("{}: {}".format(name, machine_vars[name]['value'])))
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dependencies = [
"pyserial == 3.5", # Oct 4 2023, some older platforms use this
"pyserial-asyncio == 0.6", # Oct 4 2023, handles all modern serial communication
"ruamel.yaml == 0.18.6", # Oct 4, 2023, main config file interface
"setuptools ~= 72.2.0", # Nov 16, 2024,
"sortedcontainers == 2.4.0", # Oct 4 2023, used by platform batch light system
"terminaltables == 3.1.10", # Oct 4 2023, used for the service CLI
"Pillow == 9.5.0" # Nov 4 2023. Asciimatics needs Pillow > 2.7, but latest 10.x breaks kivy for now (fix due in 2.3), so we pin to latest working Pillow for now.
Expand Down

0 comments on commit 48fbc17

Please sign in to comment.