Skip to content

Commit

Permalink
Merge pull request #3115 from branfosj/20240130150246_new_pr_esmf
Browse files Browse the repository at this point in the history
replace `run_cmd` with `run_shell_cmd` in custom easyblock for ESMF (`esmf.py`)
  • Loading branch information
jfgrimm committed Feb 9, 2024
2 parents d4e6419 + 80b25ed commit e547aa3
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions easybuild/easyblocks/e/esmf.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
from easybuild.easyblocks.generic.configuremake import ConfigureMake
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.modules import get_software_root, get_software_version
from easybuild.tools.run import run_cmd
from easybuild.tools.run import run_shell_cmd
from easybuild.tools.systemtools import get_shared_lib_ext
from easybuild.framework.easyconfig import CUSTOM

Expand Down Expand Up @@ -127,8 +127,7 @@ def configure_step(self):
env.setvar('ESMF_NETCDF_LIBS', ' '.join(netcdf_libs))

# 'make info' provides useful debug info
cmd = "make info"
run_cmd(cmd, log_all=True, simple=True, log_ok=True)
run_shell_cmd("make info")

def install_step(self):
# first, install the software
Expand All @@ -146,7 +145,7 @@ def install_step(self):

cmd = "python setup.py build --ESMFMKFILE=%s/lib/esmf.mk " % self.installdir
cmd += " && python setup.py install --prefix=%s" % self.installdir
run_cmd(cmd, log_all=True, simple=True, log_ok=True)
run_shell_cmd(cmd)

def make_module_extra(self):
"""Add install path to PYTHONPATH or EBPYTHONPREFIXES"""
Expand Down

0 comments on commit e547aa3

Please sign in to comment.