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

Simplify conan install

Browse source 
CURA-11263
This commit is contained in:
c.lamboo 2023-11-03 14:53:33 +01:00
parent a225ee56fd
commit 51ab740905
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
conanfile.py
View file

@ -156,9 +156,7 @@ class CuraConan(ConanFile):
python_installs = {} python_installs = {}
# list of python installs # list of python installs
outer = '"' if self.settings.os == "Windows" else "'" python_ins_cmd = f"python -c \"import pkg_resources; print(';'.join([(s.key+','+ s.version) for s in pkg_resources.working_set]))\""
inner = "'" if self.settings.os == "Windows" else '"'
python_ins_cmd = f"python -c {outer}import pkg_resources; print({inner};{inner}.join([(s.key+{inner},{inner}+ s.version) for s in pkg_resources.working_set])){outer}"
from six import StringIO from six import StringIO
buffer = StringIO() buffer = StringIO()
self.run(python_ins_cmd, run_environment= True, env = "conanrun", output=buffer) self.run(python_ins_cmd, run_environment= True, env = "conanrun", output=buffer)