From 08128b0513738cfbd9d17fc1dc19e9e3c535808a Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 12 Dec 2024 09:19:59 +0100 Subject: [PATCH] Sync with main Contribute to NP-NP-637 --- conanfile.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/conanfile.py b/conanfile.py index 20fdf1d59..69888c253 100644 --- a/conanfile.py +++ b/conanfile.py @@ -5,7 +5,7 @@ from conan.tools.scm import Version from conan.errors import ConanInvalidConfiguration -required_conan_version = ">=1.56.0" +required_conan_version = ">=2.7.0" class FDM_MaterialsConan(ConanFile): @@ -31,10 +31,6 @@ def export_sources(self): copy(self, "*.fdm_material", self.recipe_folder, self.export_sources_folder) copy(self, "*.sig", self.recipe_folder, self.export_sources_folder) - def validate(self): - if Version(self.version) <= Version("4"): - raise ConanInvalidConfiguration("Only versions 5+ are support") - def package(self): copy(self, "*.fdm_material", self.source_folder, os.path.join(self.package_folder, "res", "resources", "materials"), keep_path = False) copy(self, "*.sig", self.source_folder, os.path.join(self.package_folder, "res", "resources", "materials"), keep_path = False) @@ -43,7 +39,6 @@ def package_info(self): self.cpp_info.includedirs = [] self.cpp_info.resdirs = ["res"] self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res", "resources")) - self.env_info.CURA_RESOURCES.append(os.path.join(self.package_folder, "res", "resources")) def package_id(self): self.info.clear()