Skip to content

Commit 2d2e5f5

Browse files
authored
Merge branch '5.10' into CURA-12369_extra-wipe-move-with-spiralize
2 parents 4f40fe4 + 56de092 commit 2d2e5f5

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

conanfile.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class CuraEngineConan(ConanFile):
2323
exports = "LICENSE*"
2424
settings = "os", "compiler", "build_type", "arch"
2525
package_type = "application"
26-
python_requires = "sentrylibrary/1.0.0", "npmpackage/[>=1.0.0]@ultimaker/np_637"
26+
python_requires = "sentrylibrary/1.0.0", "npmpackage/[>=1.0.0]"
2727
python_requires_extend = "sentrylibrary.SentryLibrary"
2828

2929
options = {
@@ -108,8 +108,6 @@ def validate(self):
108108

109109
def build_requirements(self):
110110
self.test_requires("standardprojectsettings/[>=0.2.0]")
111-
if self.options.enable_arcus or self.options.enable_plugins:
112-
self.tool_requires("protobuf/3.21.12")
113111
if not self.conf.get("tools.build:skip_test", False, check_type=bool):
114112
self.test_requires("gtest/1.14.0")
115113
if self.options.enable_benchmarks:
@@ -126,16 +124,13 @@ def requirements(self):
126124
self.requires(req)
127125
if self.options.enable_plugins:
128126
self.requires("neargye-semver/0.3.0")
129-
self.requires("asio-grpc/2.9.2")
130127
for req in self.conan_data["requirements_plugins"]:
131128
self.requires(req)
132129
if self.options.with_cura_resources:
133130
for req in self.conan_data["requirements_cura_resources"]:
134131
self.requires(req)
135-
if self.options.enable_arcus or self.options.enable_plugins:
136-
self.requires("protobuf/3.21.12")
137132
self.requires("clipper/6.4.2@ultimaker/stable")
138-
self.requires("boost/1.83.0")
133+
self.requires("boost/1.86.0")
139134
self.requires("rapidjson/cci.20230929")
140135
self.requires("stb/cci.20230920")
141136
self.requires("spdlog/1.12.0")

0 commit comments

Comments
 (0)