From 6c7223f92b13bf54e3a5a7f72dae37313503abe8 Mon Sep 17 00:00:00 2001 From: jspijker Date: Thu, 23 Feb 2023 15:38:28 +0100 Subject: [PATCH 1/5] Use latest stable packages - uranium - curaengine - fdm_materials --- conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 5b37bdefa1..e767e0664f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -284,11 +284,11 @@ class CuraConan(ConanFile): def requirements(self): self.requires("pyarcus/5.2.2") - self.requires("curaengine/5.3.0-beta") + self.requires("curaengine/(latest)@ultimaker/stable") self.requires("pysavitar/5.2.2") self.requires("pynest2d/5.2.2") - self.requires("uranium/5.3.0-beta.2") - self.requires("fdm_materials/5.3.0-beta.1+29@ultimaker/stable") + self.requires("uranium/(latest)@ultimaker/stable") + self.requires("fdm_materials/(latest)@ultimaker/stable") self.requires("cura_binary_data/5.3.0-beta") self.requires("cpython/3.10.4") if self.options.internal: From 16a3c3715e74f4b2c67f740566e7adaf98b98e8a Mon Sep 17 00:00:00 2001 From: jspijker Date: Thu, 23 Feb 2023 15:39:17 +0100 Subject: [PATCH 2/5] Don't build with conan higher then 1.56 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index e767e0664f..16646e160f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -10,7 +10,7 @@ from conan.tools.env import VirtualRunEnv, Environment, VirtualBuildEnv from conan.tools.scm import Version from conan.errors import ConanInvalidConfiguration, ConanException -required_conan_version = ">=1.52.0" +required_conan_version = "<=1.56.0" class CuraConan(ConanFile): From b0cc2f2822ab1d5cfa24142f6667b042f04bbc46 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 23 Feb 2023 16:41:01 +0100 Subject: [PATCH 3/5] clear the info --- conanfile.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 16646e160f..bfa3b95b3b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -486,10 +486,7 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV self.runenv_info.append_path("PYTHONPATH", os.path.join(self.source_folder, "plugins")) def package_id(self): - del self.info.settings.os - del self.info.settings.compiler - del self.info.settings.build_type - del self.info.settings.arch + self.info.clear() # 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@_/_` From 9140553e70249b30dcccf9b31b3d6c17d22d43c2 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 23 Feb 2023 16:41:24 +0100 Subject: [PATCH 4/5] Revert "Use latest stable packages" This reverts commit 6c7223f92b13bf54e3a5a7f72dae37313503abe8. --- conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index bfa3b95b3b..c6b73451ab 100644 --- a/conanfile.py +++ b/conanfile.py @@ -284,11 +284,11 @@ class CuraConan(ConanFile): def requirements(self): self.requires("pyarcus/5.2.2") - self.requires("curaengine/(latest)@ultimaker/stable") + self.requires("curaengine/5.3.0-beta") self.requires("pysavitar/5.2.2") self.requires("pynest2d/5.2.2") - self.requires("uranium/(latest)@ultimaker/stable") - self.requires("fdm_materials/(latest)@ultimaker/stable") + self.requires("uranium/5.3.0-beta.2") + self.requires("fdm_materials/5.3.0-beta.1+29@ultimaker/stable") self.requires("cura_binary_data/5.3.0-beta") self.requires("cpython/3.10.4") if self.options.internal: From de51e02fe688a29fa84d2e271cae4b75a5dedc0b Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 23 Feb 2023 17:10:09 +0100 Subject: [PATCH 5/5] Revert "Revert "Use latest stable packages"" This reverts commit 9140553e70249b30dcccf9b31b3d6c17d22d43c2. --- conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index c6b73451ab..bfa3b95b3b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -284,11 +284,11 @@ class CuraConan(ConanFile): def requirements(self): self.requires("pyarcus/5.2.2") - self.requires("curaengine/5.3.0-beta") + self.requires("curaengine/(latest)@ultimaker/stable") self.requires("pysavitar/5.2.2") self.requires("pynest2d/5.2.2") - self.requires("uranium/5.3.0-beta.2") - self.requires("fdm_materials/5.3.0-beta.1+29@ultimaker/stable") + self.requires("uranium/(latest)@ultimaker/stable") + self.requires("fdm_materials/(latest)@ultimaker/stable") self.requires("cura_binary_data/5.3.0-beta") self.requires("cpython/3.10.4") if self.options.internal: