diff --git a/conandata.yml b/conandata.yml index 68f123e6af..1a49a013ee 100644 --- a/conandata.yml +++ b/conandata.yml @@ -14,14 +14,6 @@ requirements: requirements_internal: - "fdm_materials/(latest)@internal/testing" - "cura_private_data/(latest)@internal/testing" -shared_resources: - - "definitions" - - "extruders" - - "images" - - "intent" - - "meshes" - - "quality" - - "variants" urls: default: cloud_api_root: "https://api.ultimaker.com" diff --git a/resources/conanfile.py b/resources/conanfile.py index 90f2a852a1..b4cafc705e 100644 --- a/resources/conanfile.py +++ b/resources/conanfile.py @@ -18,6 +18,11 @@ class CuraResource(ConanFile): settings = "os", "compiler", "build_type", "arch" no_copy_source = True + + @property + def _shared_resources(self): + return ["definitions", "extruders", "images", "intent", "meshes", "quality", "variants"] + def set_version(self): if not self.version: self.version = self.conan_data["version"] @@ -30,7 +35,7 @@ class CuraResource(ConanFile): update_conandata(self, {"version": self.version}) def export_sources(self): - for shared_resources in self.conan_data["shared_resources"]: + for shared_resources in self._shared_resources: copy(self, pattern="*", src=os.path.join(self.recipe_folder, shared_resources), dst=os.path.join(self.export_sources_folder, shared_resources)) @@ -39,8 +44,8 @@ class CuraResource(ConanFile): raise ConanInvalidConfiguration("Only versions 5+ are support") def layout(self): - self.cpp.source.resdirs = self.conan_data["shared_resources"] - self.cpp.package.resdirs = [f"res/{res}" for res in self.conan_data["shared_resources"]] + self.cpp.source.resdirs = self._shared_resources + self.cpp.package.resdirs = [f"res/{res}" for res in self._shared_resources] def package(self): copy(self, "*", os.path.join(self.export_sources_folder),