3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 11:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge remote-tracking branch 'origin/main' into CURA-10951_gh_build_curapackage

Browse source 
# Conflicts:
#	conanfile.py
This commit is contained in:
Jelle Spijker 2023-08-29 16:13:39 +02:00
commit 87b6ad63a7
10 changed files with 112 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
conanfile.py
View file

@ -10,7 +10,7 @@ from conan.tools.env import VirtualRunEnv, Environment, VirtualBuildEnv
from conan.tools.scm import Version
from conan.errors import ConanInvalidConfiguration, ConanException
required_conan_version = ">=1.54 <=1.56.0 || >=1.58.0 <2.0.0"
required_conan_version = ">=1.58.0 <2.0.0"
class CuraConan(ConanFile):
@ -301,7 +301,7 @@ class CuraConan(ConanFile):
raise ConanInvalidConfiguration("Only versions 5+ are support")
def requirements(self):
self.requires("boost/1.81.0")
self.requires("boost/1.82.0")
self.requires("pyarcus/(latest)@ultimaker/cura_10951")
self.requires("curaengine/(latest)@ultimaker/cura_10446")
self.requires("pysavitar/(latest)@ultimaker/cura_10951")