From 33e345d1bc4b1b73ed0d33a3d8216ad622899cb8 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Fri, 2 Apr 2021 10:40:10 +0200 Subject: [PATCH] Removed upgrader for instance containers CURA-8810_version_upgrade --- .../VersionUpgrade48to49.py | 20 +------------------ .../VersionUpgrade48to49/__init__.py | 20 ------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade48to49/VersionUpgrade48to49.py b/plugins/VersionUpgrade/VersionUpgrade48to49/VersionUpgrade48to49.py index 76c3a5582e..c0a61b1014 100644 --- a/plugins/VersionUpgrade/VersionUpgrade48to49/VersionUpgrade48to49.py +++ b/plugins/VersionUpgrade/VersionUpgrade48to49/VersionUpgrade48to49.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import configparser @@ -36,24 +36,6 @@ class VersionUpgrade48to49(VersionUpgrade): parser.write(result) return [filename], [result.getvalue()] - def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: - """ - Upgrades instance containers to have the new version number. - :param serialized: The original contents of the instance container. - :param filename: The original file name of the instance container. - :return: A list of new file names, and a list of the new contents for - those files. - """ - parser = configparser.ConfigParser(interpolation = None, comment_prefixes = ()) - parser.read_string(serialized) - - # Update version number. - parser["metadata"]["setting_version"] = "17" - - result = io.StringIO() - parser.write(result) - return [filename], [result.getvalue()] - def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: """ Upgrades stacks to have the new version number. diff --git a/plugins/VersionUpgrade/VersionUpgrade48to49/__init__.py b/plugins/VersionUpgrade/VersionUpgrade48to49/__init__.py index 347df8a163..a9ee18befc 100644 --- a/plugins/VersionUpgrade/VersionUpgrade48to49/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade48to49/__init__.py @@ -17,11 +17,7 @@ def getMetaData() -> Dict[str, Any]: ("preferences", 6000016): ("preferences", 6000017, upgrade.upgradePreferences), ("machine_stack", 4000016): ("machine_stack", 4000017, upgrade.upgradeStack), ("extruder_train", 4000016): ("extruder_train", 4000017, upgrade.upgradeStack), - ("definition_changes", 4000016): ("definition_changes", 4000017, upgrade.upgradeInstanceContainer), - ("quality_changes", 4000016): ("quality_changes", 4000017, upgrade.upgradeInstanceContainer), - ("quality", 4000016): ("quality", 4000017, upgrade.upgradeInstanceContainer), ("setting_visibility", 1000000): ("setting_visibility", 2000017, upgrade.upgradeSettingVisibility), - ("user", 4000016): ("user", 4000017, upgrade.upgradeInstanceContainer), }, "sources": { "preferences": { @@ -36,25 +32,9 @@ def getMetaData() -> Dict[str, Any]: "get_version": upgrade.getCfgVersion, "location": {"./extruders"} }, - "definition_changes": { - "get_version": upgrade.getCfgVersion, - "location": {"./definition_changes"} - }, - "quality_changes": { - "get_version": upgrade.getCfgVersion, - "location": {"./quality_changes"} - }, - "quality": { - "get_version": upgrade.getCfgVersion, - "location": {"./quality"} - }, "setting_visibility": { "get_version": upgrade.getCfgVersion, "location": {"./setting_visibility"} - }, - "user": { - "get_version": upgrade.getCfgVersion, - "location": {"./user"} } } }