Skip to content

Commit

Permalink
replace run_cmd with run_shell_cmd in wxpython.py
Browse files Browse the repository at this point in the history
  • Loading branch information
branfosj committed Jan 27, 2024
1 parent f1221e2 commit 4aeb371
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions easybuild/easyblocks/w/wxpython.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -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."""
Expand All @@ -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)
Expand All @@ -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')
Expand Down

0 comments on commit 4aeb371

Please sign in to comment.