Removed deprecated !!omap YAML directives, v0.57.0.dev10

Requires MPF 0.57.0.dev19+
missionpinball · Oct 9, 2023 · c087c1f · c087c1f
1 parent 9780ba8
commit c087c1f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/mpfmc/_version.py b/mpfmc/_version.py
@@ -1,10 +1,10 @@
 import os
 
-__version__ = '0.57.0.dev9'
+__version__ = '0.57.0.dev10'
 __short_version__ = '0.57'
 __bcp_version__ = '1.1'
 __config_version__ = '6'
-__mpf_version_required__ = '0.57.0.dev16'  # ALSO UPDATE in pyproject.toml
+__mpf_version_required__ = '0.57.0.dev19'  # ALSO UPDATE in pyproject.toml
 
 # pylint: disable-msg=invalid-name
 version = f"MPF-MC v{__version__}"

diff --git a/mpfmc/integration/machine_files/high_score/modes/high_score/config/high_score.yaml b/mpfmc/integration/machine_files/high_score/modes/high_score/config/high_score.yaml
@@ -1,14 +1,14 @@
 #config_version=6
 high_score:
   _overwrite: True
-  categories: !!omap
-  - score:
+  categories:
+    score:
       - GRAND CHAMPION
       - HIGH SCORE 1
       - HIGH SCORE 2
       - HIGH SCORE 3
       - HIGH SCORE 4
-  - loops:
+    loops:
       - LOOP CHAMP
   defaults:
     score:

diff --git a/mpfmc/integration/test_HighScoreMode.py b/mpfmc/integration/test_HighScoreMode.py
@@ -1,6 +1,5 @@
 """Test high score mode."""
-from collections import OrderedDict
-import time
+
 
 from mpf.tests.MpfFakeGameTestCase import MpfFakeGameTestCase
 

diff --git a/mpfmc/widgets/segment_display_emulator.py b/mpfmc/widgets/segment_display_emulator.py
@@ -1,5 +1,4 @@
 """Widget emulating a segment display."""
-from collections import OrderedDict
 from typing import Optional, List, Dict, Any
 import math
 
@@ -229,7 +228,7 @@ def _calculate_segment_points(self):
             segment_points = self._calculate_eight_segment_points(x, y, segment_width, segment_interval, bevel_width)
 
         # Sort the segment dictionary by segment name (key)
-        segment_points = OrderedDict(sorted(segment_points.items()))
+        segment_points = dict(sorted(segment_points.items()))
 
         if self.dot_enabled:
             # Store center point of dot/period circle (diameter will be segment_width) (x, y, radius)

diff --git a/pyproject.toml b/pyproject.toml
@@ -22,7 +22,7 @@ classifiers=[
     "Topic :: Games/Entertainment :: Arcade"
     ]
 dependencies = [
-    "mpf >= 0.57.0.dev16",  # ALSO CHANGE THIS IN _version.py
+    "mpf >= 0.57.0.dev19",  # ALSO CHANGE THIS IN _version.py
     "kivy == 2.2.1",  # Sept 19, 2023
     "psutil == 5.9.5",  # Sept 19, 2023
     "Pygments == 2.16.1", # Sept 19, 2023  Only used for the interactive MC. Does anyone use that?