From 51ab7409058fd38c4541064d93e87fd64902872f Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 3 Nov 2023 14:53:33 +0100 Subject: [PATCH] Simplify conan install CURA-11263 --- conanfile.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 9fd377b6b3..20ded4bc3c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -156,9 +156,7 @@ class CuraConan(ConanFile): python_installs = {} # list of python installs - outer = '"' if self.settings.os == "Windows" else "'" - 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}" + python_ins_cmd = f"python -c \"import pkg_resources; print(';'.join([(s.key+','+ s.version) for s in pkg_resources.working_set]))\"" from six import StringIO buffer = StringIO() self.run(python_ins_cmd, run_environment= True, env = "conanrun", output=buffer)