From 1d9975c04bf42f345bb4911b5dbe594d8e2b67f3 Mon Sep 17 00:00:00 2001 From: James Edwards Date: Fri, 26 Jan 2024 15:34:56 -0700 Subject: [PATCH] back out changes in code_checker.py --- scripts/lib/CIME/code_checker.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/lib/CIME/code_checker.py b/scripts/lib/CIME/code_checker.py index 96b780ab2f6..e25b6ce163e 100644 --- a/scripts/lib/CIME/code_checker.py +++ b/scripts/lib/CIME/code_checker.py @@ -15,18 +15,16 @@ ############################################################################### def _run_pylint(on_file, interactive): ############################################################################### - pylintstr = find_executable("pylint") + pylint = find_executable("pylint") cmd_options = " --disable=I,C,R,logging-not-lazy,wildcard-import,unused-wildcard-import" cmd_options += ",fixme,broad-except,bare-except,eval-used,exec-used,global-statement" cmd_options += ",logging-format-interpolation,no-name-in-module,unspecified-encoding" cmd_options += ",arguments-renamed,no-member,redefined-outer-name" - cmd_options += ",deprecated-module,deprecated-class" - cimeroot = get_cime_root() - -# if "scripts/Tools" in on_file: -# cmd_options +=",relative-import" + + if "scripts/Tools" in on_file: + cmd_options +=",relative-import" # add init-hook option cmd_options += " --init-hook='sys.path.extend((\"%s\",\"%s\",\"%s\"))'"%\ @@ -34,7 +32,7 @@ def _run_pylint(on_file, interactive): os.path.join(cimeroot,"scripts","Tools"), os.path.join(cimeroot,"scripts","fortran_unit_testing","python")) - cmd = "%s %s %s" % (pylintstr, cmd_options, on_file) + cmd = "%s %s %s" % (pylint, cmd_options, on_file) logger.debug("pylint command is %s"%cmd) stat, out, err = run_cmd(cmd, verbose=False, from_dir=cimeroot) if stat != 0: