mpf 0.80.0.dev8__tar.gz → 0.80.0.dev9__tar.gz

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/.github/workflows/build_wheels.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.12
 
       - name: Install MPF
         run: |

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/.github/workflows/prospector.yml

@@ -6,7 +6,7 @@ jobs:
   prospector:
     name: Run Prospector on all Python files
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -14,6 +14,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
+          # Ubuntu can't run 3.12 because Pillow dependencies.
           python-version: 3.11
 
       - name: Install MPF

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/.github/workflows/run_tests.yml

@@ -18,6 +18,8 @@ jobs:
           python-version: "3.10"
         - os: windows-latest
           python-version: 3.11
+        - os: windows-latest
+          python-version: 3.12
         - os: ubuntu-latest
           python-version: 3.8
         - os: ubuntu-latest
@@ -26,6 +28,7 @@ jobs:
           python-version: "3.10"
         - os: ubuntu-latest
           python-version: 3.11
+        # Ubuntu can't run 3.12 because Pillow dependencies.
         - os: macos-latest
           python-version: 3.8
         - os: macos-latest
@@ -34,6 +37,8 @@ jobs:
           python-version: "3.10"
         - os: macos-latest
           python-version: 3.11
+        - os: macos-latest
+          python-version: 3.12
 
     steps:
       - name: Checkout MPF

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpf
-Version: 0.80.0.dev8
+Version: 0.80.0.dev9
 Summary: The Mission Pinball Framework (MPF)
 Author-email: The Mission Pinball Framework Team <brian@missionpinball.org>
 License: MIT
@@ -21,7 +21,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Topic :: Artistic Software
 Classifier: Topic :: Games/Entertainment :: Arcade
-Requires-Python: >=3.8
+Requires-Python: <3.13,>=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 License-File: AUTHORS.md

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/_version.py

@@ -10,7 +10,7 @@ PyPI.
 
 """
 
-__version__ = '0.80.0.dev8'
+__version__ = '0.80.0.dev9'
 '''The full version of MPF.'''
 
 __short_version__ = '0.80'
@@ -19,6 +19,9 @@ __short_version__ = '0.80'
 __bcp_version__ = '1.1'
 '''The version of BCP this build of MPF uses.'''
 
+__gmc_version__ = '0.1.5'
+'''The version of GMC this build of MPF requires.'''
+
 __config_version__ = '6'
 '''The config file version this build of MPF uses.'''
 

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/config_spec.yaml

@@ -455,7 +455,7 @@ diverters:
     __type__: device
     activate_events: event_handler|event_handler:ms|None
     activation_coil: single|machine(coils)|None
-    activation_time: single|ms|0
+    activation_time: single|template_ms|None
     activation_switches: list|machine(switches)|None
     allow_multiple_concurrent_ejects_to_same_side: single|bool|true
     cool_down_time: single|ms|0
@@ -628,6 +628,7 @@ fast:
     __type__: config
     net: single|subconfig(fast_net)|None
     exp: single|subconfig(fast_exp)|None
+    exp_int: single|subconfig(fast_exp)|None    
     aud: single|subconfig(fast_aud)|None
     seg: single|subconfig(fast_seg)|None
     dmd: single|subconfig(fast_dmd)|None

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/core/bcp/bcp_socket_client.py

@@ -6,7 +6,7 @@ import asyncio
 
 from typing import Tuple
 
-from mpf._version import __version__, __bcp_version__
+from mpf._version import __version__, __bcp_version__, __gmc_version__
 from mpf.core.bcp.bcp_client import BaseBcpClient
 
 BYTE_MARKER = b'&bytes='
@@ -348,7 +348,9 @@ class BCPClientSocket(BaseBcpClient):
         """Send BCP 'hello' command."""
         self.send('hello', {"version": __bcp_version__,
                             "controller_name": 'Mission Pinball Framework',
-                            "controller_version": __version__})
+                            "controller_version": __version__,
+                            "gmc_version": __gmc_version__,
+                            })
 
     def send_goodbye(self):
         """Send BCP 'goodbye' command."""

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/devices/diverter.py

@@ -258,7 +258,7 @@ class Diverter(SystemWideDevice):
     def schedule_deactivation(self):
         """Schedule a delay to deactivate this diverter."""
         if self.config['activation_time']:
-            self.delay.add(name='deactivate_timed', ms=self.config['activation_time'],
+            self.delay.add(name='deactivate_timed', ms=self.config['activation_time'].evaluate({}),
                            callback=self.deactivate)
 
     def _enable_switches(self):

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/devices/shot.py

@@ -425,8 +425,8 @@ class Shot(EnableDisableMixin, ModeDevice):
     def _register_control_event_handlers(self):
         for control_event in self.config['control_events']:
             for event in control_event['events']:
-                self._handlers.append(self.machine.events.add_handler(event, self._control_events,
-                                                                      control_event_config=control_event))
+                self.machine.events.add_handler(event, self._control_events,
+                                                control_event_config=control_event)
 
     @event_handler(7)
     def _control_events(self, control_event_config, **kwargs):

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/modes/high_score/config/high_score.yaml

@@ -7,7 +7,7 @@ mode:
   use_wait_queue: true
 
 # Instructions on how to use this mode:
-# https://missionpinball.org/game_logic/high_scores
+# https://missionpinball.org/latest/game_logic/high_scores
 
 high_score:
   enter_initials_timeout: 60
@@ -27,6 +27,17 @@ high_score:
       - QC: 42
       - MPF: 23
 
+event_player:
+  sw_left_flipper_active:
+    text_input:
+      action: left
+  sw_right_flipper_active:
+    text_input:
+      action: right
+  sw_start_active:
+    text_input:
+      action: select
+
 slide_player:
   high_score_enter_initials:
     high_score:

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/platforms/fast/fast.py

@@ -45,7 +45,7 @@ class FastHardwarePlatform(ServoPlatform, LightsPlatform, RgbDmdPlatform,
                  "io_boards", "io_boards_by_name", "switches_initialized",
                  "drivers_initialized", "audio_interface"]
 
-    port_types = ['net', 'exp', 'aud', 'dmd', 'rgb', 'seg', 'emu']
+    port_types = ['net', 'exp', 'exp_int', 'aud', 'dmd', 'rgb', 'seg', 'emu']
 
     def __init__(self, machine):
         """Initialize FAST hardware platform.
@@ -247,6 +247,11 @@ class FastHardwarePlatform(ServoPlatform, LightsPlatform, RgbDmdPlatform,
                     FastExpCommunicator
                 communicator = FastExpCommunicator(platform=self, processor=port, config=config)
                 self.serial_connections['exp'] = communicator
+            elif port == 'exp_int':
+                from mpf.platforms.fast.communicators.exp import \
+                    FastExpCommunicator
+                communicator = FastExpCommunicator(platform=self, processor=port, config=config)
+                self.serial_connections['exp_int'] = communicator
             elif port == 'seg':
                 from mpf.platforms.fast.communicators.seg import \
                     FastSegCommunicator

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/platforms/fast/fast_port_detector.py

@@ -82,7 +82,7 @@ class FastPortDetector:
                 try:
                     data = await asyncio.wait_for(reader.read(100), timeout=1.0)
                 except asyncio.TimeoutError:
-                    pass
+                    data = None
 
                 if data:
                     data = data.decode('utf-8', errors='ignore')

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/plugins/auditor.py

@@ -236,17 +236,19 @@ class Auditor(MpfPlugin):
                 if item not in self.machine.game.player.vars:
                     continue
 
+                value = player[item]
+
                 self.current_audits['player'][item]['top'] = (
                     self._merge_into_top_list(
-                        player[item],
+                        value,
                         self.current_audits['player'][item]['top'],
                         self.config['num_player_top_records']))
 
-                self.current_audits['player'][item]['average'] = int(
-                    ((self.current_audits['player'][item]['total'] *
-                      self.current_audits['player'][item]['average']) +
-                     self.machine.game.player[item]) /
-                    (self.current_audits['player'][item]['total'] + 1))
+                self.current_audits['player'][item]['average'] = int((
+                    (self.current_audits['player'][item]['total']
+                        * self.current_audits['player'][item]['average'])
+                    + value
+                ) / (self.current_audits['player'][item]['total'] + 1))
 
                 self.current_audits['player'][item]['total'] += 1
         if self._autosave:

mpf-0.80.0.dev9/mpf/tests/machine_files/diverter/config/test_hold_activation_time_template.yaml

@@ -0,0 +1,24 @@
+#config_version=6
+
+config:
+- config.yaml
+
+diverters:
+    d_test_activation_time_template:
+        activation_coil: c_diverter
+        activation_switches: s_diverter
+        type: hold
+        feeder_devices: test_trough
+        targets_when_active: playfield
+        targets_when_inactive: test_target
+        activation_time: settings.d_test_activation_time
+        debug: True
+
+settings:
+    d_test_activation_time:
+        sort: 1212
+        label: Diverter test activation time
+        key_type: int
+        default: 12000
+        values:
+            12000: '12s'

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/tests/test_Auditor.py

@@ -167,3 +167,26 @@ class TestAuditor(MpfFakeGameTestCase):
         self.assertEqual(0, data_manager.written_data['switches']['s_test'])
         self.assertEqual(0, auditor.current_audits['events']['game_started'])
         self.assertEqual(0, data_manager.written_data['events']['game_started'])
+
+    def test_auditor_score_statistics(self):
+        auditor = self.machine.plugins[0]
+        self.assertIsInstance(auditor, Auditor)
+
+        self.start_two_player_game()
+        self.post_event("add_score")
+        self.post_event("add_score")
+        self.assertPlayerVarEqual(200, "score")
+        self.drain_all_balls()
+        self.assertPlayerVarEqual(0, "score")
+        self.post_event("add_score")
+        self.post_event("add_score")
+        self.post_event("add_score")
+        self.post_event("add_score")
+        self.post_event("add_score")
+        self.assertPlayerVarEqual(500, "score")
+        self.drain_all_balls()
+        self.assertGameIsNotRunning()
+
+        self.assertEqual(350, auditor.current_audits['player']['score']['average'])
+        self.assertEqual([500, 200], auditor.current_audits['player']['score']['top'])
+        self.assertEqual(2, auditor.current_audits['player']['score']['total'])

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/tests/test_Diverter.py

@@ -175,6 +175,55 @@ class TestDiverter(MpfTestCase):
         self.advance_time_and_run(4)
         assert not self.machine.coils["c_diverter"].enable.called
 
+    @test_config("test_hold_activation_time_template.yaml")
+    def test_activation_time_template(self):
+        diverter = self.machine.diverters["d_test_activation_time_template"]
+
+        self.machine.coils["c_diverter"].enable = MagicMock()
+        self.machine.coils["c_diverter"].disable = MagicMock()
+
+        self.assertFalse(diverter.enabled)
+        self.assertFalse(diverter.active)
+
+        self.machine.playfield.config['default_source_device'] = self.machine.ball_devices["test_trough"]
+        self.machine.playfield.add_ball()
+
+        self.advance_time_and_run(1)
+        self.assertTrue(diverter.enabled)
+        self.assertFalse(diverter.active)
+
+        self.hit_and_release_switch("s_diverter")
+        self.advance_time_and_run(0.5)
+        self.assertTrue(diverter.enabled)
+        self.assertTrue(diverter.active)
+        self.machine.coils["c_diverter"].enable.assert_called_once_with()
+        self.machine.coils["c_diverter"].enable = MagicMock()
+        assert not self.machine.coils["c_diverter"].disable.called
+
+        self.advance_time_and_run(12)
+        self.machine.coils["c_diverter"].disable.assert_called_once_with()
+        assert not self.machine.coils["c_diverter"].enable.called
+
+        self.hit_and_release_switch("s_playfield")
+        self.machine_run()
+        self.assertFalse(diverter.active)
+
+        self.hit_switch_and_run("s_ball_switch1", 1)
+        self.machine.playfield.config['default_source_device'] = self.machine.ball_devices["test_target"]
+        self.machine.playfield.add_ball()
+
+        self.advance_time_and_run(3)
+        self.assertFalse(diverter.enabled)
+        self.assertFalse(diverter.active)
+
+        self.hit_and_release_switch("s_diverter")
+        self.advance_time_and_run(0.5)
+        self.assertFalse(diverter.enabled)
+        self.assertFalse(diverter.active)
+
+        self.advance_time_and_run(4)
+        assert not self.machine.coils["c_diverter"].enable.called
+
     @test_config("test_hold_no_activation_time.yaml")
     def test_hold_no_activation_time(self):
         diverter = self.machine.diverters["d_test_hold"]

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/tests/test_Lisy.py

@@ -1,4 +1,6 @@
 import time
+import sys
+import unittest
 
 from mpf.platforms.interfaces.segment_display_platform_interface import FlashingType
 from mpf.platforms.lisy import lisy
@@ -114,6 +116,7 @@ class MockLisySocket(MockSocket, MockSerial):
         self.api_version = api_version
 
 
+@unittest.skipIf(sys.version_info >= (3, 12), "LISY tests not updated for 3.12 asyncio")
 class TestLisy(MpfTestCase):
 
     def get_config_file(self):

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/tests/test_PKONE.py

@@ -1,3 +1,6 @@
+import sys
+import unittest
+
 from mpf.core.platform import SwitchConfig
 from mpf.core.rgb_color import RGBColor
 from mpf.platforms.pkone.pkone import PKONEHardwarePlatform
@@ -81,6 +84,7 @@ class BaseMockPKONE(MockSerial):
         pass
 
 
+@unittest.skipIf(sys.version_info >= (3, 12), "PKONE tests not updated for 3.12 asyncio")
 class TestPKONE(MpfTestCase):
 
     """Test the Penny K Pinball PKONE hardware platform."""

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf/tests/test_Spike.py

@@ -1,6 +1,8 @@
 """Test Stern Spike Platform."""
 import time
 import serial_asyncio
+import sys
+import unittest
 
 from mpf.platforms.spike.spike import SpikePlatform
 
@@ -128,6 +130,7 @@ class MockSpikeSocket(MockSerial):
         self.dirty_nodes = []
 
 
+@unittest.skipIf(sys.version_info >= (3, 12), "SPIKE tests not updated for 3.12 asyncio")
 class SpikePlatformTest(MpfTestCase):
 
     @staticmethod
@@ -648,6 +651,7 @@ class SpikePlatformTest(MpfTestCase):
         self.assertEventCalledWith("stepper_stepper1_ready", position=500)
 
 
+@unittest.skipIf(sys.version_info >= (3, 12), "SPIKE tests not updated for 3.12 asyncio")
 class SpikePlatformFirmware0_49Test(MpfTestCase):
 
     @staticmethod

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpf
-Version: 0.80.0.dev8
+Version: 0.80.0.dev9
 Summary: The Mission Pinball Framework (MPF)
 Author-email: The Mission Pinball Framework Team <brian@missionpinball.org>
 License: MIT
@@ -21,7 +21,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Topic :: Artistic Software
 Classifier: Topic :: Games/Entertainment :: Arcade
-Requires-Python: >=3.8
+Requires-Python: <3.13,>=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 License-File: AUTHORS.md

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/mpf.egg-info/SOURCES.txt

@@ -836,6 +836,7 @@ mpf/tests/machine_files/diverter/config/test_diverter_with_switch.yaml
 mpf/tests/machine_files/diverter/config/test_eject_to_oposide_sides.yaml
 mpf/tests/machine_files/diverter/config/test_eject_to_oposide_sides2.yaml
 mpf/tests/machine_files/diverter/config/test_hold_activation_time.yaml
+mpf/tests/machine_files/diverter/config/test_hold_activation_time_template.yaml
 mpf/tests/machine_files/diverter/config/test_hold_no_activation_time.yaml
 mpf/tests/machine_files/diverter/config/test_missing_ball_at_source.yaml
 mpf/tests/machine_files/diverter/config/test_pulsed_activation_time.yaml

{mpf-0.80.0.dev8 → mpf-0.80.0.dev9}/pyproject.toml

@@ -2,7 +2,7 @@
 name = "mpf"
 description = "The Mission Pinball Framework (MPF)"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.8,<3.13"
 license = {text = "MIT"}
 authors = [{ name = "The Mission Pinball Framework Team", email = "brian@missionpinball.org"}]
 keywords = ["pinball"]