diff options
| author | j.spijker@ultimaker.com <jelle spijker> | 2022-06-18 17:44:07 +0300 |
|---|---|---|
| committer | jspijker <j.spijker@ultimaker.com> | 2022-06-18 17:44:07 +0300 |
| commit | ac6f939db39011f8c66f37b755e7b3b3a62654e9 (patch) | |
| tree | 7bb9c292223096a5b52bf511f95db4b00b9023f6 /conanfile.py | |
| parent | dce96a6abd45ed305a1222d469324f2b08734ece (diff) | |
Use Conan CPython package
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
Diffstat (limited to 'conanfile.py')
| -rw-r--r-- | conanfile.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/conanfile.py b/conanfile.py index 16e08e55eb..077272eb9e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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"): |