diff --git a/.github/workflows/run_test_suite.yml b/.github/workflows/run_test_suite.yml index c3fcc310..d2a6ed23 100644 --- a/.github/workflows/run_test_suite.yml +++ b/.github/workflows/run_test_suite.yml @@ -7,13 +7,13 @@ jobs: strategy: matrix: python-version: - - 3.7 + - 3.9 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} diff --git a/MARBL_tools/code_consistency.py b/MARBL_tools/code_consistency.py index 83a6a54f..5fdc9387 100755 --- a/MARBL_tools/code_consistency.py +++ b/MARBL_tools/code_consistency.py @@ -9,7 +9,7 @@ import logging from collections import deque # Faster pop / append than standard lists from collections import OrderedDict -UNIBLOCK = u"\u2588" +UNIBLOCK = u"\u2588" # pylint: disable=redundant-u-string-prefix ############## @@ -218,8 +218,8 @@ def check_r8_settings(self, file_and_line, line, comment_char="!"): else: MARBL_ROOT = os.path.join(SCRIPT_DIR, '..') - fortran_files = [] # pylint: disable=C0103 - python_files = [] # pylint: disable=C0103 + fortran_files = [] + python_files = [] for root, dirs, files in os.walk(MARBL_ROOT): for thisfile in files: if thisfile.endswith(".F90"): @@ -231,7 +231,7 @@ def check_r8_settings(self, file_and_line, line, comment_char="!"): logging.basicConfig(format='%(message)s', level=logging.DEBUG) LOGGER = logging.getLogger(__name__) - Tests = ConsistencyTestClass() # pylint: disable=C0103 + Tests = ConsistencyTestClass() # Fortran error checks LOGGER.info("Check Fortran files for coding standard violations:") diff --git a/MARBL_tools/netcdf_comparison.py b/MARBL_tools/netcdf_comparison.py index e888a3f5..b41931b8 100755 --- a/MARBL_tools/netcdf_comparison.py +++ b/MARBL_tools/netcdf_comparison.py @@ -270,8 +270,8 @@ def _parse_args(): logging.basicConfig(format='%(message)s', level=logging.INFO) LOGGER = logging.getLogger(__name__) - args = _parse_args() # pylint: disable=invalid-name - ds_base_in, ds_new_in = _open_files(args.baseline, args.new_file) # pylint: disable=invalid-name + args = _parse_args() + ds_base_in, ds_new_in = _open_files(args.baseline, args.new_file) if args.strict == 'loose': if ds_comparison_loose(ds_base_in, ds_new_in, args.rtol, args.atol, args.thres): LOGGER.error("Differences found between files!")