Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace run_cmd with run_shell_cmd in custom easyblock for wxPython (wxpython.py) #3093

Merged
merged 1 commit into from
Jan 29, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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