3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 06:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use Conan CPython package

Browse source 
Now all our deps are compiled with the same flags.
This should help to make it more agnostic over the
systems.

Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-06-18 16:44:07 +02:00 • committed by jspijker
parent dce96a6abd
commit ac6f939db3
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
conanfile.py
View file

@ -31,7 +31,6 @@ class CuraConan(ConanFile):
python_requires_extend = "umbase.UMBaseConanfile"
options = {
"python_version": "ANY",
"enterprise": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string
"staging": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string
"devtools": [True, False], # FIXME: Split this up in testing and (development / build (pyinstaller) / system installer) tools
@ -40,7 +39,6 @@ class CuraConan(ConanFile):
"cura_debug_mode": [True, False] # FIXME: Use profiles
}
default_options = {
"python_version": "system",
"enterprise": "False",
"staging": "False",
"devtools": False,
@ -85,13 +83,8 @@ class CuraConan(ConanFile):
return ["requirements.txt", "requirements-ultimaker.txt", "requirements-dev.txt"]
return ["requirements.txt", "requirements-ultimaker.txt"]
def config_options(self):
if self.options.python_version == "system":
self.options.python_version = python_version()
def configure(self):
self.options["*"].shared = True
self.options["*"].python_version = self.options.python_version
def validate(self):
if self.version and tools.Version(self.version) <= tools.Version("4"):