Merge pull request #1038 from ocefpaf/fix_pre-commits

Fix pre commits

.pre-commit-config.yaml

@@ -19,24 +19,24 @@ repos:
         - test_requirements.txt
 
 - repo: https://github.com/psf/black
-  rev: 23.3.0
+  rev: 23.7.0
   hooks:
   - id: black
     language_version: python3
 
 - repo: https://github.com/asottile/add-trailing-comma
-  rev: v3.0.0
+  rev: v3.1.0
   hooks:
     - id: add-trailing-comma
 
 
 - repo: https://github.com/charliermarsh/ruff-pre-commit
-  rev: v0.0.277
+  rev: v0.0.287
   hooks:
     - id: ruff
 
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: 0.13.0
+  rev: 1.1.0
   hooks:
     - id: pyproject-fmt
 

cchecker.py

@@ -253,8 +253,8 @@ def main():
         for checker_name in sorted(checker_names):
             if checker_name not in check_suite.checkers:
                 print(
-                    "Cannot find checker '{}' with which to "
-                    "describe checks".format(checker_name),
+                    f"Cannot find checker '{checker_name}' with which to "
+                    "describe checks",
                     file=sys.stderr,
                 )
                 error_stat = 1
@@ -293,9 +293,7 @@ def main():
     if output_len == 1:
         if args.format != "json":
             print(
-                "Running Compliance Checker on the datasets from: {}".format(
-                    args.dataset_location,
-                ),
+                f"Running Compliance Checker on the datasets from: {args.dataset_location}",
                 file=sys.stderr,
             )
         return_value, errors = ComplianceChecker.run_checker(
@@ -315,9 +313,7 @@ def main():
         for output, dataset in zip(args.output, args.dataset_location):
             if args.format != "json":
                 print(
-                    "Running Compliance Checker on the dataset from: {}".format(
-                        dataset,
-                    ),
+                    f"Running Compliance Checker on the dataset from: {dataset}",
                     file=sys.stderr,
                 )
             return_value, errors = ComplianceChecker.run_checker(

compliance_checker/acdd.py

@@ -249,8 +249,8 @@ def check_lat_extents(self, ds):
                 False,
                 "geospatial_lat_extents_match",
                 [
-                    "Could not convert one of geospatial_lat_min ({}) or max ({}) to float see CF-1.6 spec chapter 4.1"
-                    "".format(ds.geospatial_lat_min, ds.geospatial_lat_max),
+                    f"Could not convert one of geospatial_lat_min ({ds.geospatial_lat_min}) or max ({ds.geospatial_lat_max}) to float see CF-1.6 spec chapter 4.1"
+                    "",
                 ],
             )
 
@@ -347,8 +347,8 @@ def check_lon_extents(self, ds):
                 False,
                 "geospatial_lon_extents_match",
                 [
-                    "Could not convert one of geospatial_lon_min ({}) or max ({}) to float see CF-1.6 spec chapter 4.1"
-                    "".format(ds.geospatial_lon_min, ds.geospatial_lon_max),
+                    f"Could not convert one of geospatial_lon_min ({ds.geospatial_lon_min}) or max ({ds.geospatial_lon_max}) to float see CF-1.6 spec chapter 4.1"
+                    "",
                 ],
             )
 
@@ -440,7 +440,7 @@ def verify_geospatial_bounds(self, ds):
                 [
                     (
                         "Could not parse WKT from geospatial_bounds,"
-                        ' possible bad value: "{}"'.format(ds.geospatial_bounds)
+                        f' possible bad value: "{ds.geospatial_bounds}"'
                     ),
                 ],
                 variable_name="geospatial_bounds",
@@ -637,19 +637,13 @@ def check_time_extents(self, ds):
         if start_dt > timedelta(hours=1):
             msgs.append(
                 "Date time mismatch between time_coverage_start and actual "
-                "time values {} (time_coverage_start) != {} (time[0])".format(
-                    t_min.isoformat(),
-                    time0.isoformat(),
-                ),
+                f"time values {t_min.isoformat()} (time_coverage_start) != {time0.isoformat()} (time[0])",
             )
             score -= 1
         if end_dt > timedelta(hours=1):
             msgs.append(
                 "Date time mismatch between time_coverage_end and actual "
-                "time values {} (time_coverage_end) != {} (time[N])".format(
-                    t_max.isoformat(),
-                    time1.isoformat(),
-                ),
+                f"time values {t_max.isoformat()} (time_coverage_end) != {time1.isoformat()} (time[N])",
             )
             score -= 1
 
@@ -676,9 +670,7 @@ def verify_convention_version(self, ds):
             return ratable_result((1, 2), "Global Attributes", m)
         except AttributeError:  # NetCDF attribute not found
             m = [
-                "No Conventions attribute present; must contain ACDD-{}".format(
-                    self._cc_spec_version,
-                ),
+                f"No Conventions attribute present; must contain ACDD-{self._cc_spec_version}",
             ]
             # Result will have name "Global Attributes" to group with globals
             return ratable_result((0, 2), "Global Attributes", m)

compliance_checker/base.py

@@ -480,10 +480,7 @@ def attr_check(kvp, ds, priority, ret_val, gname=None, var_name=None):
             msgs.append(f"{display_name} not present")
         elif res == 1:
             msgs.append(
-                "{} present, but not in expected value list ({})".format(
-                    display_name,
-                    sorted(other),
-                ),
+                f"{display_name} present, but not in expected value list ({sorted(other)})",
             )
 
         ret_val.append(