From 4aeb3716eed0d47dadb202da46e32f23b2540520 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Sat, 27 Jan 2024 13:36:17 +0000 Subject: [PATCH] replace run_cmd with run_shell_cmd in wxpython.py --- easybuild/easyblocks/w/wxpython.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/easybuild/easyblocks/w/wxpython.py b/easybuild/easyblocks/w/wxpython.py index b7f9de2162..b5a6c86d28 100644 --- a/easybuild/easyblocks/w/wxpython.py +++ b/easybuild/easyblocks/w/wxpython.py @@ -36,7 +36,7 @@ from easybuild.easyblocks.generic.pythonpackage import PythonPackage, det_python_version from easybuild.tools.filetools import change_dir, symlink from easybuild.tools.modules import get_software_root -from easybuild.tools.run import run_cmd +from easybuild.tools.run import run_shell_cmd from easybuild.tools.systemtools import get_shared_lib_ext @@ -63,10 +63,10 @@ def build_step(self): # Do we need to build wxWidgets internally? if self.wxflag == '': cmd = base_cmd + " build_wx" - run_cmd(cmd, log_all=True, simple=True) + run_shell_cmd(cmd) cmd = base_cmd + " %s build_py" % self.wxflag - run_cmd(cmd, log_all=True, simple=True) + run_shell_cmd(cmd) def install_step(self): """Custom install procedure for wxPython.""" @@ -83,7 +83,7 @@ def install_step(self): } # install fails and attempts to install in the python module. building the wheel, and then installing it cmd = cmd + " %s -v bdist_wheel" % self.wxflag - run_cmd(cmd, log_all=True, simple=True) + run_shell_cmd(cmd) # get whether it is 35, 36, 37, 38, etc. pyver = det_python_version(self.python_cmd) @@ -106,7 +106,7 @@ def install_step(self): } cmd = cmd + " --wxpy_installdir=%s --install" % self.installdir - run_cmd(cmd, log_all=True, simple=True) + run_shell_cmd(cmd) # add symbolic links for libwx_*so.* files # (which are created automatically by 'build.py install', but not by 'pip install *.whl')