From 0eed64a2ea5c1d054a5cdee529de78251fd12d97 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 29 Mar 2022 14:53:50 +0200 Subject: Upgrade 19 to 20, not 17 to 19 I was mixing up the versions there. The new version needs to be 20, since 19 was already used for 4.13. We can't use 18 since that was reserved by the betas from which we can never upgrade. Contributes to issue CURA-8466. --- .../VersionUpgrade413to50/VersionUpgrade413to50.py | 6 +++--- plugins/VersionUpgrade/VersionUpgrade413to50/__init__.py | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade413to50/VersionUpgrade413to50.py b/plugins/VersionUpgrade/VersionUpgrade413to50/VersionUpgrade413to50.py index 703ffa2186..7cbb163966 100644 --- a/plugins/VersionUpgrade/VersionUpgrade413to50/VersionUpgrade413to50.py +++ b/plugins/VersionUpgrade/VersionUpgrade413to50/VersionUpgrade413to50.py @@ -39,7 +39,7 @@ class VersionUpgrade413to50(VersionUpgrade): parser.read_string(serialized) # Update version number. - parser["metadata"]["setting_version"] = "19" + parser["metadata"]["setting_version"] = "20" # Remove deleted settings from the visible settings list. if "general" in parser and "visible_settings" in parser["general"]: @@ -77,7 +77,7 @@ class VersionUpgrade413to50(VersionUpgrade): parser.read_string(serialized) # Update version number. - parser["metadata"]["setting_version"] = "19" + parser["metadata"]["setting_version"] = "20" if "values" in parser: # Remove deleted settings from the instance containers. @@ -119,7 +119,7 @@ class VersionUpgrade413to50(VersionUpgrade): if "metadata" not in parser: parser["metadata"] = {} - parser["metadata"]["setting_version"] = "19" + parser["metadata"]["setting_version"] = "20" result = io.StringIO() parser.write(result) diff --git a/plugins/VersionUpgrade/VersionUpgrade413to50/__init__.py b/plugins/VersionUpgrade/VersionUpgrade413to50/__init__.py index bbe4133540..c00339d0c8 100644 --- a/plugins/VersionUpgrade/VersionUpgrade413to50/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade413to50/__init__.py @@ -14,13 +14,13 @@ def getMetaData() -> Dict[str, Any]: return { "version_upgrade": { # From To Upgrade function - ("preferences", 6000017): ("preferences", 6000019, upgrade.upgradePreferences), - ("machine_stack", 5000017): ("machine_stack", 5000019, upgrade.upgradeStack), - ("extruder_train", 5000017): ("extruder_train", 5000019, upgrade.upgradeStack), - ("definition_changes", 4000017): ("definition_changes", 4000019, upgrade.upgradeInstanceContainer), - ("quality_changes", 4000017): ("quality_changes", 4000019, upgrade.upgradeInstanceContainer), - ("quality", 4000017): ("quality", 4000019, upgrade.upgradeInstanceContainer), - ("user", 4000017): ("user", 4000019, upgrade.upgradeInstanceContainer), + ("preferences", 6000019): ("preferences", 6000020, upgrade.upgradePreferences), + ("machine_stack", 5000019): ("machine_stack", 5000020, upgrade.upgradeStack), + ("extruder_train", 5000019): ("extruder_train", 5000020, upgrade.upgradeStack), + ("definition_changes", 4000019): ("definition_changes", 4000020, upgrade.upgradeInstanceContainer), + ("quality_changes", 4000019): ("quality_changes", 4000020, upgrade.upgradeInstanceContainer), + ("quality", 4000019): ("quality", 4000020, upgrade.upgradeInstanceContainer), + ("user", 4000019): ("user", 4000020, upgrade.upgradeInstanceContainer), }, "sources": { "preferences": { -- cgit v1.2.3