From ddb5aee0568bf14cd7c2c3790748e3cb49288ffa Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 13 Dec 2024 20:43:19 +0100 Subject: [PATCH] Use private data from internal conan-user --- conandata.yml | 4 ++-- conanfile.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conandata.yml b/conandata.yml index 56536e1176..6bec3ee231 100644 --- a/conandata.yml +++ b/conandata.yml @@ -9,8 +9,8 @@ requirements: - "pysavitar/5.4.0-alpha.0@ultimaker/stable" - "pynest2d/5.4.0-alpha.0@ultimaker/stable" requirements_internal: - - "fdm_materials_private/5.10.0-alpha.0@ultimaker/testing" - - "cura_private_data/5.10.0-alpha.0@ultimaker/testing" + - "fdm_materials/5.10.0-alpha.0@internal/testing" + - "cura_private_data/5.10.0-alpha.0@internal/testing" requirements_enterprise: - "native_cad_plugin/2.0.0" urls: diff --git a/conanfile.py b/conanfile.py index 659915b0ba..01e2ffb579 100644 --- a/conanfile.py +++ b/conanfile.py @@ -412,7 +412,7 @@ class CuraConan(ConanFile): # Copy materials (flat) rmdir(self, str(Path(self.source_folder, "resources", "materials"))) - fdm_materials = self.dependencies["fdm_materials_private" if self.options.internal else "fdm_materials"].cpp_info + fdm_materials = self.dependencies["fdm_materials"].cpp_info copy(self, "*", fdm_materials.resdirs[0], self.source_folder) # Copy internal resources