Merge

Author: WhiteMagic

gremlin/util.py

@@ -1060,3 +1060,19 @@ def latest_gremlin_version() -> Optional[str]:
             return json_data.get("version", None)
     except Exception:
         return None
+
+
+def get_code_version() -> str:
+    """Returns the version contained in the code's version.json file.
+
+    Returns:
+        String representation of the code's version.
+    """
+    version_file = resource_path("version.json")
+    if not file_exists_and_is_accessible(version_file):
+        return "0.0.0"
+
+    try:
+        return json.load(open(version_file))["version"]
+    except json.decoder.JSONDecodeError:
+        return "0.0.0"

joystick_gremlin.py

@@ -130,7 +130,7 @@ def register_config_options() -> None:
     )
     cfg.register(
         "global", "internal", "last-known-version",
-        PropertyType.String, "0.0.0",
+        PropertyType.String, gremlin.util.get_code_version(),
         "Last known version of Gremlin.", {}
     )
     cfg.register(

joystick_gremlin.spec

@@ -15,6 +15,7 @@ datas = [
     ("gfx", "gfx"),
     ("qml", "qml"),
     ("device_db.json", "."),
+    ("version.json", ".")
 ]
 datas.extend(action_plugins_files)
 binaries = [

qml/DialogAbout.qml

@@ -27,7 +27,7 @@ Window {
         }
 
         DisplayLabel {
-            text: "Release 14"
+            text: "Release 14.1"
             font.pointSize: 14
         }
 

test/action_interaction/test_macro.py

@@ -130,8 +130,8 @@ def test_hat_toggle(jgbot: JoystickGremlinBot, profile_dir: Path) -> None:
         expected_value += 0.1
         assert EventSpec(
             InputType.JoystickAxis, OUT_AXIS_1, 0.1) == jgbot.next_event()
-        assert jgbot.axis(OUT_AXIS_1) == pytest.approx(expected_value, abs=0.01)
 
+    assert jgbot.axis(OUT_AXIS_1) == pytest.approx(expected_value, abs=0.01)
     assert jgbot.event_count() == 0
     jgbot.set_hat_direction(IN_HAT_1, HatDirection.South)
     jgbot.set_hat_direction(IN_HAT_1, HatDirection.Center)

version.json

@@ -1,3 +1,3 @@
 {
-  "version": "14.0.0"
+  "version": "14.1.0"
 }