From b7a5b2fd62d3b134ec0b275217a7283c4cc76939 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 27 Nov 2024 09:19:56 +0100 Subject: [PATCH] (win build) make it work locally again part if CURA-11622 --- conanfile.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/conanfile.py b/conanfile.py index 6fce951def..39767f67f2 100644 --- a/conanfile.py +++ b/conanfile.py @@ -121,12 +121,13 @@ class CuraConan(ConanFile): self.output.info("Collecting python installs") python_installs = {} - outer = '"' if self.settings.os == "Windows" else "'" - inner = "'" if self.settings.os == "Windows" else '"' + temp_exec = "temp.py" + code = f"import importlib.metadata; print(';'.join([(package.metadata['Name']+','+ package.metadata['Version']) for package in importlib.metadata.distributions()]))" + save(self, temp_exec, code) + buffer = StringIO() - self.run(f"""python -c {outer}import importlib.metadata; print({inner};{inner}.join([(package.metadata[{inner}Name{inner}]+{inner},{inner}+ package.metadata[{inner}Version{inner}]) for package in importlib.metadata.distributions()])){outer}""", - env = "virtual_python_env", - stdout = buffer) + self.run(f"""python {temp_exec}""", env = "virtual_python_env", stdout = buffer) + rm(self, temp_exec, ".") packages = str(buffer.getvalue()).strip('\r\n').split(";") for package in packages: