From cdc8fd759b8835a0bf0e0d22b6ba0118794e4651 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 28 Jun 2022 15:08:07 +0200 Subject: [PATCH] Don't use CuraVersion.py options to calc package_id The following options shouldn't be used to determine the hash, since these are only used to set the CuraVersion.py which will als be generated by the deploy method during the `conan install cura/5.1.0@_/_` Contributes to CURA-9365 --- conanfile.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/conanfile.py b/conanfile.py index 6bd307e95c..cbbf04c0fb 100644 --- a/conanfile.py +++ b/conanfile.py @@ -283,3 +283,16 @@ class CuraConan(ConanFile): del self.info.settings.compiler del self.info.settings.build_type del self.info.settings.arch + + # The following options shouldn't be used to determine the hash, since these are only used to set the CuraVersion.py + # which will als be generated by the deploy method during the `conan install cura/5.1.0@_/_` + del self.info.options.enterprise + del self.info.options.staging + del self.info.options.devtools + del self.info.options.cloud_api_version + del self.info.options.display_name + del self.info.options.cura_debug_mode + + # TODO: Use the hash of requirements.txt and requirements-ultimaker.txt, Because changing these will actually result in a different + # Cura. This is needed because the requirements.txt aren't managed by Conan and therefor not resolved in the package_id. This isn't + # ideal but an acceptable solution for now.