Bump ruff to 0.9.2

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
   - id:  no-commit-to-branch
     args: ['--branch', 'master']
@@ -13,7 +13,7 @@ repos:
   - id: trailing-whitespace
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.7
+    rev: v0.9.2
     hooks:
     - id: ruff
       args: [ --fix ]

res2df/common.py

@@ -476,7 +476,7 @@ def fill_reverse_parser(
     """
     parser.add_argument(
         "csvfile",
-        help="Name of CSV file with " + modulename + " data with " "res2df format",
+        help="Name of CSV file with " + modulename + " data with res2df format",
     )
     parser.add_argument(
         "-o",

res2df/compdat.py

@@ -615,8 +615,7 @@ def expand_wlist(wlist_df: pd.DataFrame) -> pd.DataFrame:
             and wlist_record["NAME"] not in currentstate
         ):
             raise ValueError(
-                "WLIST ADD/DEL only works on existing well lists: "
-                f"{str(wlist_record)}"
+                f"WLIST ADD/DEL only works on existing well lists: {str(wlist_record)}"
             )
         if wlist_record["ACTION"] == "ADD":
             currentstate[wlist_record["NAME"]] = " ".join(
@@ -888,14 +887,12 @@ def applywelopen(
             ].drop_duplicates(subset=["I", "J", "K1", "K2"], keep="last")
         else:
             raise ValueError(
-                "A WELOPEN keyword contains data that could not be parsed. "
-                f"\n {row} "
+                f"A WELOPEN keyword contains data that could not be parsed. \n {row} "
             )
 
         if previous_state.empty:
             raise ValueError(
-                "A WELOPEN keyword is not acting on any existing connection. "
-                f"\n {row} "
+                f"A WELOPEN keyword is not acting on any existing connection. \n {row} "
             )
 
         new_state = previous_state

res2df/csv2res.py

@@ -90,8 +90,7 @@ def get_parser() -> argparse.ArgumentParser:
         "satfunc",
         help="Write saturation function include files",
         description=(
-            "Write saturation function include files from CSV files with "
-            "res2df format."
+            "Write saturation function include files from CSV files with res2df format."
         ),
     )
     satfunc_fill_reverse_parser(satfunc_parser)

res2df/equil.py

@@ -298,7 +298,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
         "-o",
         "--output",
         type=str,
-        help=("Name of output csv file. " "Use '-' for stdout."),
+        help=("Name of output csv file. Use '-' for stdout."),
         default="equil.csv",
     )
     parser.add_argument(

res2df/grid.py

@@ -686,10 +686,7 @@ def df2res(
 
     if "GLOBAL_INDEX" not in grid_df:
         logger.warning(
-            (
-                "Global index not found in grid dataframe. "
-                "Assumes all cells are active"
-            )
+            ("Global index not found in grid dataframe. Assumes all cells are active")
         )
         # Drop NaN rows for columns to be used (triggered by stacked
         # dates and no global index, unlikely)

res2df/gruptree.py

@@ -91,7 +91,7 @@ def df(
     # Flags which will tell when a new network related keyword
     # has been encountered
     keywords = ["GRUPTREE", "BRANPROP", "WELSPECS", "GRUPNET", "NODEPROP"]
-    found_keywords = {key: False for key in keywords}
+    found_keywords = dict.fromkeys(keywords, False)
     for kword in deck:
         if kword.name in ["DATES", "START", "TSTEP"]:
             # Whenever we encounter a new DATES, it means that
@@ -107,7 +107,7 @@ def df(
                 edgerecords += _write_edgerecords(
                     currentedges, nodedata, wellspecsedges, found_keywords, date
                 )
-                found_keywords = {key: False for key in keywords}
+                found_keywords = dict.fromkeys(keywords, False)
             # Done dumping the data for the previous date, parse the fresh
             # date:
             if kword.name in ["DATES", "START"]:

res2df/satfunc.py

@@ -144,9 +144,9 @@ def interpolate_defaults(dframe: pd.DataFrame) -> pd.DataFrame:
     can consist of multiple SATNUMs.
     """
     sat_cols: set = {"SW", "SO", "SG", "SL"}.intersection(dframe.columns)
-    assert (
-        len(sat_cols) == 1
-    ), f"Could not determine a single saturation column in {dframe.columns}"
+    assert len(sat_cols) == 1, (
+        f"Could not determine a single saturation column in {dframe.columns}"
+    )
     sat_col = list(sat_cols)[0]
 
     if dframe[sat_col].isna().any():

res2df/summary.py

@@ -761,9 +761,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
         "-o",
         "--output",
         type=str,
-        help=(
-            "Name of output file. Use '-' to write to stdout. " "Default 'summary.csv'"
-        ),
+        help=("Name of output file. Use '-' to write to stdout. Default 'summary.csv'"),
         default="summary.csv",
     )
     parser.add_argument("--arrow", action="store_true", help="Write to pyarrow format")