diff options
| author | jspijker <j.spijker@ultimaker.com> | 2022-07-19 11:26:37 +0300 |
|---|---|---|
| committer | jspijker <j.spijker@ultimaker.com> | 2022-07-19 11:26:37 +0300 |
| commit | 828c591310dedc11027bd30c4a8ec7f072a8f247 (patch) | |
| tree | 870670c80af0d2cc63e4b9756f3787758ac7098c | |
| parent | 0ee5635867fd3b080dc602f1a1fc88c0e2912ff4 (diff) | |
Contributes to CURA-9365
| -rw-r--r-- | conanfile.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/conanfile.py b/conanfile.py index ab09c5b3d..c8e019e7c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -21,7 +21,7 @@ class CuraEngineConan(ConanFile): exports = "LICENSE*" settings = "os", "compiler", "build_type", "arch" - python_requires = "umbase/0.1.4@ultimaker/testing" + python_requires = "umbase/0.1.5@ultimaker/testing" python_requires_extend = "umbase.UMBaseConanfile" options = { @@ -68,20 +68,18 @@ class CuraEngineConan(ConanFile): raise ConanInvalidConfiguration("Only versions 5+ are support") def build_requirements(self): - channel = "" if not self.channel else self.channel if self.options.enable_arcus: - for req in self._um_data(self.version, channel)["build_requirements_arcus"]: + for req in self._um_data()["build_requirements_arcus"]: self.tool_requires(req) if self.options.enable_testing: - for req in self._um_data(self.version, channel)["build_requirements_testing"]: + for req in self._um_data()["build_requirements_testing"]: self.test_requires(req) def requirements(self): - channel = "" if not self.channel else self.channel - for req in self._um_data(self.version, channel)["requirements"]: + for req in self._um_data()["requirements"]: self.requires(req) if self.options.enable_arcus: - for req in self._um_data(self.version, channel)["requirements_arcus"]: + for req in self._um_data()["requirements_arcus"]: self.requires(req) def generate(self): |