From 15ddca25b79a5971331a958fb03c7a91b6c094eb Mon Sep 17 00:00:00 2001 From: James Edwards Date: Mon, 29 Jan 2024 07:13:32 -0700 Subject: [PATCH] revert pylint changes --- scripts/fortran_unit_testing/run_tests.py | 2 +- scripts/lib/CIME/code_checker.py | 2 +- scripts/lib/CIME/namelist.py | 1 - scripts/tests/scripts_regression_tests.py | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/fortran_unit_testing/run_tests.py b/scripts/fortran_unit_testing/run_tests.py index 29b14f1043d..63efa914e0d 100755 --- a/scripts/fortran_unit_testing/run_tests.py +++ b/scripts/fortran_unit_testing/run_tests.py @@ -130,7 +130,7 @@ def parse_command_line(args): args = CIME.utils.parse_args_and_handle_standard_logging_options(args, parser) output = Printer(color=args.color) - # pylint: disable=broad-exception-raised + if args.xml_test_list is None and args.test_spec_dir is None: output.print_error( "You must specify either --test-spec-dir or --xml-test-list." diff --git a/scripts/lib/CIME/code_checker.py b/scripts/lib/CIME/code_checker.py index e25b6ce163e..6c3c23570b0 100644 --- a/scripts/lib/CIME/code_checker.py +++ b/scripts/lib/CIME/code_checker.py @@ -15,7 +15,7 @@ ############################################################################### def _run_pylint(on_file, interactive): ############################################################################### - pylint = 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" diff --git a/scripts/lib/CIME/namelist.py b/scripts/lib/CIME/namelist.py index 7dc192a47e6..f8874810e54 100644 --- a/scripts/lib/CIME/namelist.py +++ b/scripts/lib/CIME/namelist.py @@ -863,7 +863,6 @@ def shouldRaise(eclass, method, *args, **kw): if not isinstance(e, eclass): raise return - # pylint: disable=broad-exception-raised raise Exception("Expected exception %s not raised" % str(eclass)) diff --git a/scripts/tests/scripts_regression_tests.py b/scripts/tests/scripts_regression_tests.py index b155106e09b..1a921ac7177 100755 --- a/scripts/tests/scripts_regression_tests.py +++ b/scripts/tests/scripts_regression_tests.py @@ -2764,7 +2764,7 @@ def check_for_pylint(): from distutils.spawn import find_executable pylint = find_executable("pylint") if pylint is not None: - output = run_cmd_no_fail("pylint --version") + output = run_cmd_no_fail(pylint+" --version") pylintver = re.search(r"pylint\s+(\d+)[.](\d+)[.](\d+)", output) major = int(pylintver.group(1)) minor = int(pylintver.group(2))