Skip to content

Commit 48fbc17

Browse files
committed
Merge branch 'dev' into 0.80.x
# Conflicts: # mpf/core/text_ui.py
2 parents 5689953 + f98c2e2 commit 48fbc17

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

mpf/core/text_ui.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,8 @@ def _update_machine_vars(self, **kwargs):
353353
machine_vars = self.machine.variables.machine_vars
354354
# If config defines explict vars to show, only show those.
355355
# Otherwise, filter out the unhelpful defaults
356-
names = self.config.get('machine_vars', [
357-
n for n in machine_vars.keys() if not (n.startswith("audits") or n.startswith("platform") or n.startswith("mpf"))
356+
names = self.config.get('machine_vars', [n for n in machine_vars.keys() if not (
357+
n.startswith("audits") or n.startswith("platform") or n.startswith("mpf"))
358358
])
359359
for name in names:
360360
self._machine_widgets.append(Label("{}: {}".format(name, machine_vars[name]['value'])))

pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ dependencies = [
3030
"pyserial == 3.5", # Oct 4 2023, some older platforms use this
3131
"pyserial-asyncio == 0.6", # Oct 4 2023, handles all modern serial communication
3232
"ruamel.yaml == 0.18.6", # Oct 4, 2023, main config file interface
33+
"setuptools ~= 72.2.0", # Nov 16, 2024,
3334
"sortedcontainers == 2.4.0", # Oct 4 2023, used by platform batch light system
3435
"terminaltables == 3.1.10", # Oct 4 2023, used for the service CLI
3536
"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.

0 commit comments

Comments
 (0)