res2df 1.3.7__py3-none-any.whl → 1.3.8__py3-none-any.whl

res2df/pvt.py

@@ -8,7 +8,7 @@ import argparse
 import contextlib
 import logging
 from pathlib import Path
-from typing import Dict, List, Optional, Union
+from typing import cast
 
 import pandas as pd
 
@@ -27,14 +27,12 @@ from .resdatafiles import ResdataFiles
 
 with contextlib.suppress(ImportError):
     # Needed for mypy
-
-    # pylint: disable=unused-import
     import opm.io
 
 
 logger: logging.Logger = logging.getLogger(__name__)
 
-SUPPORTED_KEYWORDS: List[str] = [
+SUPPORTED_KEYWORDS: list[str] = [
     "PVTO",
     "PVDO",
     "PVTG",
@@ -48,7 +46,7 @@ SUPPORTED_KEYWORDS: List[str] = [
 # desired column names in produced dataframes. They also to a certain
 # extent determine the structure of the dataframe, in particular
 # for keywords with arbitrary data amount pr. record (PVTO f.ex)
-RENAMERS: Dict[str, Dict[str, Union[str, List[str]]]] = {}
+RENAMERS: dict[str, dict[str, str | list[str]]] = {}
 
 # P_bub (bubble point pressure) is called PRESSURE for ability to merge with
 # other pressure data from other frames.
@@ -80,7 +78,7 @@ RENAMERS["ROCK"] = {"PREF": "PRESSURE", "COMPRESSIBILITY": "COMPRESSIBILITY"}
 
 
 def pvtw_fromdeck(
-    deck: Union[str, "opm.libopmcommon_python.Deck"], ntpvt: Optional[int] = None
+    deck: "str | opm.opmcommon_python.Deck", ntpvt: int | None = None
 ) -> pd.DataFrame:
     """Extract PVTW from a :term:`deck`
 
@@ -97,7 +95,7 @@ def pvtw_fromdeck(
 
 
 def density_fromdeck(
-    deck: Union[str, "opm.libopmcommon_python.Deck"], ntpvt: Optional[int] = None
+    deck: "str | opm.opmcommon_python.Deck", ntpvt: int | None = None
 ) -> pd.DataFrame:
     """Extract DENSITY from a :term:`deck`
 
@@ -114,7 +112,7 @@ def density_fromdeck(
 
 
 def rock_fromdeck(
-    deck: Union[str, "opm.libopmcommon_python.Deck"], ntpvt: Optional[int] = None
+    deck: "str | opm.opmcommon_python.Deck", ntpvt: int | None = None
 ) -> pd.DataFrame:
     """Extract ROCK from a :term:`deck`
 
@@ -131,7 +129,7 @@ def rock_fromdeck(
 
 
 def pvto_fromdeck(
-    deck: Union[str, "opm.libopmcommon_python.Deck"], ntpvt: Optional[int] = None
+    deck: "str | opm.opmcommon_python.Deck", ntpvt: int | None = None
 ) -> pd.DataFrame:
     """Extract PVTO from a :term:`deck`
 
@@ -149,7 +147,7 @@ def pvto_fromdeck(
 
 
 def pvdo_fromdeck(
-    deck: Union[str, "opm.libopmcommon_python.Deck"], ntpvt: Optional[int] = None
+    deck: "str | opm.opmcommon_python.Deck", ntpvt: int | None = None
 ) -> pd.DataFrame:
     """Extract PVDO from a :term:`deck`
 
@@ -167,7 +165,7 @@ def pvdo_fromdeck(
 
 
 def pvdg_fromdeck(
-    deck: Union[str, "opm.libopmcommon_python.Deck"], ntpvt: Optional[int] = None
+    deck: "str | opm.opmcommon_python.Deck", ntpvt: int | None = None
 ) -> pd.DataFrame:
     """Extract PVDG from a :term:`deck`
 
@@ -185,7 +183,7 @@ def pvdg_fromdeck(
 
 
 def pvtg_fromdeck(
-    deck: Union[str, "opm.libopmcommon_python.Deck"], ntpvt: Optional[int] = None
+    deck: "str | opm.opmcommon_python.Deck", ntpvt: int | None = None
 ) -> pd.DataFrame:
     """Extract PVTG from a :term:`deck`
 
@@ -203,9 +201,9 @@ def pvtg_fromdeck(
 
 
 def df(
-    deck: Union[str, "opm.libopmcommon_python.Deck"],
-    keywords: Optional[List[str]] = None,
-    ntpvt: Optional[int] = None,
+    deck: "str | opm.opmcommon_python.Deck",
+    keywords: list[str] | None = None,
+    ntpvt: int | None = None,
 ) -> pd.DataFrame:
     """Extract all (most) PVT data from a :term:`deck`.
 
@@ -292,9 +290,7 @@ def fill_reverse_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentPar
 
 def pvt_main(args) -> None:
     """Entry-point for module, for command line utility for Eclipse to CSV"""
-    logger = getLogger_res2csv(  # pylint: disable=redefined-outer-name
-        __name__, vars(args)
-    )
+    logger = getLogger_res2csv(__name__, vars(args))
     resdatafiles = ResdataFiles(args.DATAFILE)
     logger.info("Parsed %s", args.DATAFILE)
     if resdatafiles:
@@ -327,9 +323,7 @@ def pvt_main(args) -> None:
 def pvt_reverse_main(args) -> None:
     """Entry-point for module, for command line utility for CSV to simulator
     :term:`deck`"""
-    logger = getLogger_res2csv(  # pylint: disable=redefined-outer-name
-        __name__, vars(args)
-    )
+    logger = getLogger_res2csv(__name__, vars(args))
     pvt_df = pd.read_csv(args.csvfile)
     logger.info("Parsed %s", args.csvfile)
     inc_string = df2res(pvt_df, keywords=args.keywords)
@@ -338,9 +332,9 @@ def pvt_reverse_main(args) -> None:
 
 def df2res(
     pvt_df: pd.DataFrame,
-    keywords: Optional[Union[str, List[str]]] = None,
-    comments: Optional[Dict[str, str]] = None,
-    filename: Optional[str] = None,
+    keywords: str | list[str] | None = None,
+    comments: dict[str, str] | None = None,
+    filename: str | None = None,
 ) -> str:
     """Generate resdata :term:`include file` content from PVT dataframes
 
@@ -364,7 +358,7 @@ def df2res(
     )
 
 
-def df2res_rock(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
+def df2res_rock(dframe: pd.DataFrame, comment: str | None = None) -> str:
     """Create string with :term:`include file` contents for ROCK keyword
 
     Args:
@@ -389,7 +383,7 @@ def df2res_rock(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
     return string + "\n"
 
 
-def df2res_density(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
+def df2res_density(dframe: pd.DataFrame, comment: str | None = None) -> str:
     """Create string with :term:`include file` contents for DENSITY keyword
 
     Args:
@@ -418,7 +412,7 @@ def df2res_density(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
     return string + "\n"
 
 
-def df2res_pvtw(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
+def df2res_pvtw(dframe: pd.DataFrame, comment: str | None = None) -> str:
     """Create string with :term:`include file` contents for PVTW keyword
 
     PVTW is one line/record with data for a reference pressure
@@ -451,7 +445,7 @@ def df2res_pvtw(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
     return string + "\n"
 
 
-def df2res_pvtg(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
+def df2res_pvtg(dframe: pd.DataFrame, comment: str | None = None) -> str:
     """Create string with :term:`include file` contents for PVTG keyword
 
     Args:
@@ -489,7 +483,7 @@ def df2res_pvtg(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
         PVTG-data with a particular gas phase pressure"""
         string = ""
         assert len(dframe.index.unique()) == 1
-        p_gas = dframe.index.values[0]
+        p_gas = dframe.index.to_numpy()[0]
         string += f"{p_gas:20.7f}  "
         for rowidx, row in dframe.reset_index().iterrows():
             indent = "\n" + " " * 22 if rowidx > 0 else ""
@@ -506,7 +500,7 @@ def df2res_pvtg(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
     return string + "\n"
 
 
-def df2res_pvdg(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
+def df2res_pvdg(dframe: pd.DataFrame, comment: str | None = None) -> str:
     """Create string with :term:`include file` contents for PVDG keyword
 
     This data consists of one table (volumefactor and visosity
@@ -548,13 +542,13 @@ def df2res_pvdg(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
 
     subset = subset.set_index("PVTNUM").sort_index()
     for pvtnum in subset.index.unique():
-        string += "-- PVTNUM: {pvtnum}\n"
+        string += f"-- PVTNUM: {pvtnum}\n"
         string += _pvdg_pvtnum(subset[subset.index == pvtnum])
 
     return string + "\n"
 
 
-def df2res_pvdo(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
+def df2res_pvdo(dframe: pd.DataFrame, comment: str | None = None) -> str:
     """Create string with :term:`include file` contents for PVDO keyword
 
     Args:
@@ -599,7 +593,7 @@ def df2res_pvdo(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
     return string + "\n"
 
 
-def df2res_pvto(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
+def df2res_pvto(dframe: pd.DataFrame, comment: str | None = None) -> str:
     """Create string with :term:`include file` contents for PVTO-data from a dataframe
 
     Args:
@@ -636,9 +630,10 @@ def df2res_pvto(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
         for PVTO-data for a particular RS"""
         string = ""
         assert len(dframe.index.unique()) == 1
-        rs = dframe.index.values[0]
+        rs = dframe.index.to_numpy()[0]
         string += f"{rs:20.7f}  "
         for rowidx, row in dframe.reset_index().iterrows():
+            rowidx = cast(int, rowidx)
             indent = "\n" + " " * 22 if rowidx > 0 else ""
             string += (
                 indent

res2df/res2csv.py

@@ -7,8 +7,6 @@ in res2df
 import argparse
 import functools
 import importlib
-import sys
-from typing import Optional
 
 from .__version__ import __version__
 
@@ -26,14 +24,11 @@ def get_parser() -> argparse.ArgumentParser:
         "--version", action="version", version=f"%(prog)s {__version__}"
     )
 
-    if sys.version_info.major >= 3 and sys.version_info.minor >= 7:
-        subparsers = parser.add_subparsers(  # type: ignore
-            required=True,
-            dest="subcommand",
-            parser_class=argparse.ArgumentParser,
-        )
-    else:
-        subparsers = parser.add_subparsers(parser_class=argparse.ArgumentParser)
+    subparsers = parser.add_subparsers(  # type: ignore
+        required=True,
+        dest="subcommand",
+        parser_class=argparse.ArgumentParser,
+    )
 
     subparsers_dict = {}
     subparsers_dict["grid"] = subparsers.add_parser(
@@ -233,7 +228,7 @@ def get_parser() -> argparse.ArgumentParser:
 def run_subparser_main(
     args,
     submodule: str,
-    parser: Optional[argparse.ArgumentParser] = None,
+    parser: argparse.ArgumentParser | None = None,
 ) -> None:
     """Wrapper for running the subparsers main() function, with
     custom argument handling.
@@ -255,12 +250,12 @@ def run_subparser_main(
         parser: Used for raising errors.
     """
     if "DATAFILE" in args:
-        positionals = list(filter(len, [args.DATAFILE] + args.hiddenemptyplaceholders))
-        args.DATAFILE = "".join([args.DATAFILE] + args.hiddenemptyplaceholders)
+        positionals = list(filter(len, [args.DATAFILE, *args.hiddenemptyplaceholders]))
+        args.DATAFILE = "".join([args.DATAFILE, *args.hiddenemptyplaceholders])
     elif "PRTFILE" in args:
         # Special treatment for the fipreports submodule
-        positionals = list(filter(len, [args.PRTFILE] + args.hiddenemptyplaceholders))
-        args.PRTFILE = "".join([args.PRTFILE] + args.hiddenemptyplaceholders)
+        positionals = list(filter(len, [args.PRTFILE, *args.hiddenemptyplaceholders]))
+        args.PRTFILE = "".join([args.PRTFILE, *args.hiddenemptyplaceholders])
     if len(positionals) > 1 and parser is not None:
         parser.error(f"Unknown argument in {positionals}")
 

res2df/res2csvlogger.py

@@ -1,14 +1,12 @@
 import logging
 import sys
-from typing import Dict, Optional, Union
 
 from .constants import MAGIC_STDOUT
 
 
 def getLogger_res2csv(
-    module_name: str = "res2df", args_dict: Optional[Dict[str, Union[str, bool]]] = None
+    module_name: str = "res2df", args_dict: dict[str, str | bool] | None = None
 ) -> logging.Logger:
-    # pylint: disable=invalid-name
     """Provide a custom logger for res2csv and csv2res
 
     Logging output is by default split by logging levels (split between WARNING and

res2df/resdatafiles.py

@@ -4,7 +4,7 @@ import errno
 import logging
 import os
 from pathlib import Path
-from typing import Any, List, Optional, Tuple, Union
+from typing import Any
 
 try:
     import opm.io
@@ -24,7 +24,7 @@ logger = logging.getLogger(__name__)
 
 if HAVE_OPM:
     # Default parse option to opm.io for a very permissive parsing
-    OPMIOPARSER_RECOVERY: List[Tuple[str, Any]] = [
+    OPMIOPARSER_RECOVERY: list[tuple[str, Any]] = [
         ("PARSE_EXTRA_DATA", opm.io.action.ignore),
         ("PARSE_EXTRA_RECORDS", opm.io.action.ignore),
         ("PARSE_INVALID_KEYWORD_COMBINATION", opm.io.action.ignore),
@@ -39,7 +39,7 @@ if HAVE_OPM:
     ]
 
 
-class ResdataFiles(object):
+class ResdataFiles:
     """
     Class for holding reservoir simulator :term:`output files <output file>`
 
@@ -83,7 +83,7 @@ class ResdataFiles(object):
         """Return the full path to the directory with the .DATA file"""
         return Path(self._eclbase).absolute().parent
 
-    def get_deck(self) -> "opm.libopmcommon_python.Deck":
+    def get_deck(self) -> "opm.opmcommon_python.Deck":
         """Return a opm.io :term:`deck` of the .DATA file"""
         if not self._deck:
             if Path(self._eclbase + ".DATA").is_file():
@@ -98,8 +98,8 @@ class ResdataFiles(object):
 
     @staticmethod
     def str2deck(
-        string: str, parsecontext: Optional[List[Tuple[str, Any]]] = None
-    ) -> "opm.libopmcommon_python.Deck":
+        string: str, parsecontext: list[tuple[str, Any]] | None = None
+    ) -> "opm.opmcommon_python.Deck":
         """Produce a opm.io :term:`deck` from a string, using permissive
         parsing by default"""
         if parsecontext is None:
@@ -107,7 +107,7 @@ class ResdataFiles(object):
         return opm.io.Parser().parse_string(string, parsecontext)
 
     @staticmethod
-    def file2deck(filename: Union[str, Path]) -> "opm.libopmcommon_python.Deck":
+    def file2deck(filename: str | Path) -> "opm.opmcommon_python.Deck":
         """Try to convert standalone files into opm.io Deck objects"""
         return ResdataFiles.str2deck(Path(filename).read_text(encoding="utf-8"))
 
@@ -256,4 +256,4 @@ class ResdataFiles(object):
 
 def rreplace(pat: str, sub: str, string: str) -> str:
     """Variant of str.replace() that only replaces at the end of the string"""
-    return string[0 : -len(pat)] + sub if string.endswith(pat) else string  # noqa
+    return string[0 : -len(pat)] + sub if string.endswith(pat) else string

res2df/rft.py

@@ -17,7 +17,8 @@ import argparse
 import collections
 import datetime
 import logging
-from typing import Any, Dict, Iterable, Optional, Set
+from collections.abc import Iterable
+from typing import Any
 
 import numpy as np
 import pandas as pd
@@ -31,8 +32,8 @@ from .resdatafiles import ResdataFiles
 logger: logging.Logger = logging.getLogger(__name__)
 
 # In debug mode, these columns will be exported to three csv files.
-CON_TOPOLOGY_COLS: Set = {"CONIDX", "CONBRNO", "CONSEGNO", "CONNXT", "DEPTH"}
-SEG_TOPOLOGY_COLS: Set = {
+CON_TOPOLOGY_COLS: set = {"CONIDX", "CONBRNO", "CONSEGNO", "CONNXT", "DEPTH"}
+SEG_TOPOLOGY_COLS: set = {
     "SEGIDX",
     "SEGIDX_upstream",
     "SEGBRNO",
@@ -45,7 +46,7 @@ SEG_TOPOLOGY_COLS: Set = {
     "LEAF",
     "SEGDEPTH",
 }
-ICD_TOPOLOGY_COLS: Set = {
+ICD_TOPOLOGY_COLS: set = {
     "ICD_SEGBRNO_upstream",
     "ICD_SEGIDX_upstream",
     "ICD_LEAF",
@@ -83,27 +84,25 @@ def _rftrecords2df(rftfile: ResdataFile) -> pd.DataFrame:
     """
     nav_df = pd.DataFrame(rftfile.headers)
     nav_df.columns = ["recordname", "recordlength", "recordtype"]
-    nav_df["timeindex"] = np.nan
+    mask = nav_df["recordname"].eq("TIME")
+    nav_df["timeindex"] = np.where(mask, nav_df.index, np.nan)
     # the TIME record (in recordname) signifies that the forthcoming records
     # belong to  this TIME value, and we make a new column in the header data that
     # tells us the row number for the associated TIME record
-    nav_df.loc[nav_df["recordname"] == "TIME", "timeindex"] = nav_df[
-        nav_df["recordname"] == "TIME"
-    ].index
-    nav_df.ffill(
-        inplace=True
+    nav_df = (
+        nav_df.ffill()
     )  # forward fill (because any record is associated to the previous TIME record)
     nav_df["timeindex"] = nav_df["timeindex"].astype(int)
     logger.info(
         "Located %s RFT headers at %s distinct dates",
-        str(len(nav_df)),
-        str(len(nav_df["timeindex"].unique())),
+        len(nav_df),
+        len(nav_df["timeindex"].unique()),
     )
     nav_df.index.name = "recordidx"
     return nav_df.reset_index()
 
 
-def rftrecords(rftfile: ResdataFile) -> Iterable[Dict[str, Any]]:
+def rftrecords(rftfile: ResdataFile) -> Iterable[dict[str, Any]]:
     """Generator for looping over RFT records in a ResdataFile object.
 
     Each returned RFT record is represented as a dict with the keys:
@@ -115,7 +114,7 @@ def rftrecords(rftfile: ResdataFile) -> Iterable[Dict[str, Any]]:
     navigation_frame = _rftrecords2df(rftfile)
     for timeindex, headers in navigation_frame.groupby("timeindex"):
         headers = headers.set_index("recordname")
-        rftrecord = {}
+        rftrecord: dict[str, Any] = {}
         rftrecord["headers"] = headers
         # All rows in nav_record_df represents  the data in the current
         # RFT record
@@ -137,7 +136,7 @@ def rftrecords(rftfile: ResdataFile) -> Iterable[Dict[str, Any]]:
 
 
 def get_con_seg_data(
-    rftrecord: Dict[str, Any], rftfile: ResdataFile, datatype: str
+    rftrecord: dict[str, Any], rftfile: ResdataFile, datatype: str
 ) -> pd.DataFrame:
     """
     Build a dataframe of CON* or SEG* data for a specific RFT record,
@@ -185,9 +184,9 @@ def get_con_seg_data(
     )
 
     # Ensure integer headers are integers:
-    integer_columns = headers[headers["recordtype"] == "INTE"].index.values
+    integer_columns = headers[headers["recordtype"] == "INTE"].index.to_numpy()
     for col in (set(integer_columns) - {"DATE"}).intersection(
-        set(data_headers["recordname"].values)
+        set(data_headers["recordname"].to_numpy())
     ):
         data[col] = data[col].astype(int)
     data[datatype + "IDX"] = data.index + 1  # Add an index that starts with 1
@@ -245,8 +244,7 @@ def process_seg_topology(seg_data: pd.DataFrame) -> pd.DataFrame:
     seg_data["SEGNXT"] = seg_data["SEGNXT"].fillna(value="0").astype(int)
 
     # Outer merge first to add the upstream segment information to every row.
-    merged = pd.merge(
-        seg_data,
+    merged = seg_data.merge(
         seg_data,
         how="left",
         left_on="SEGIDX",
@@ -261,7 +259,7 @@ def process_seg_topology(seg_data: pd.DataFrame) -> pd.DataFrame:
 
     # Now we can determine leaf segments by those with no extra information, since
     # we did an outer merge:
-    merged["LEAF"] = merged["SEGIDX_upstream"].replace(0, np.nan).isnull()
+    merged["LEAF"] = merged["SEGIDX_upstream"].replace(0, np.nan).isna()
 
     # Flag segments that have multiple upstream segments as junctions
     merged["JUNCTION"] = merged["SEGIDX"].duplicated(keep=False)
@@ -300,7 +298,7 @@ def seg2dicttree(seg_data: pd.DataFrame) -> dict:
         if "SEGIDX_upstream" in row and row["SEGIDX_upstream"] > 0:
             edges.append((row["SEGIDX_upstream"], row["SEGIDX"]))
     if not edges:
-        return {seg_data["SEGIDX"].values[0]: {}}
+        return {seg_data["SEGIDX"].to_numpy()[0]: {}}
     for child, parent in edges:
         subtrees[parent][child] = subtrees[child]
 
@@ -325,7 +323,7 @@ def pretty_print_well(seg_data: pd.DataFrame) -> str:
     return str(tree_from_dict(dicttree))
 
 
-def split_seg_icd(seg_data: pd.DataFrame) -> pd.DataFrame:
+def split_seg_icd(seg_data: pd.DataFrame) -> tuple[pd.DataFrame, pd.DataFrame]:
     """Split a segment dataframe into a dataframe
     with non-ICD segments and one with.
 
@@ -354,10 +352,12 @@ def split_seg_icd(seg_data: pd.DataFrame) -> pd.DataFrame:
     #    STOP: Cannot use this criteria, because junctions  due to ICDs
     #    are legit.
     #  * The segment must be on a branch with only one segment
-    icd_seg_indices = seg_data[seg_data["LEAF"] & seg_data["LONELYSEG"]].index.values
+    icd_seg_indices = seg_data[
+        seg_data["LEAF"] & seg_data["LONELYSEG"]
+    ].index.to_numpy()
     non_icd_seg_indices = seg_data[
         ~(seg_data["LEAF"] & seg_data["LONELYSEG"])
-    ].index.values
+    ].index.to_numpy()
 
     icd_seg_data = seg_data.reindex(icd_seg_indices)
     seg_data = seg_data.reindex(non_icd_seg_indices)
@@ -367,7 +367,7 @@ def split_seg_icd(seg_data: pd.DataFrame) -> pd.DataFrame:
     logger.debug(
         "Found %d ICD segments, indices %s",
         len(icd_seg_data),
-        str(icd_seg_data["ICD_SEGIDX"].values),
+        icd_seg_data["ICD_SEGIDX"].to_numpy(),
     )
 
     return (seg_data, icd_seg_data)
@@ -375,8 +375,8 @@ def split_seg_icd(seg_data: pd.DataFrame) -> pd.DataFrame:
 
 def merge_icd_seg_conseg(
     con_data: pd.DataFrame,
-    seg_data: Optional[pd.DataFrame] = None,
-    icd_data: Optional[pd.DataFrame] = None,
+    seg_data: pd.DataFrame | None = None,
+    icd_data: pd.DataFrame | None = None,
 ) -> pd.DataFrame:
     """
     Merge ICD segments to the CONxxxxx data. We will be
@@ -425,14 +425,12 @@ def merge_icd_seg_conseg(
     if not icd_data.empty:
         # Merge ICD_* columns onto the dataframe representing reservoir
         # connections.
-        data = pd.merge(con_data, icd_data, left_on="CONSEGNO", right_on="ICD_SEGIDX")
+        data = con_data.merge(icd_data, left_on="CONSEGNO", right_on="ICD_SEGIDX")
 
         # Merge SEGxxxxx to the dataframe with icd's and reservoir connections.
         assert not seg_data.empty
 
-        data = pd.merge(
-            data, seg_data, how="left", left_on="ICD_SEGNXT", right_on="SEGIDX"
-        )
+        data = data.merge(seg_data, how="left", left_on="ICD_SEGNXT", right_on="SEGIDX")
 
         # The merge has potentially included extra rows due to junctions.
         # After ICD merge, we can require that SEGIDX_upstream equals CONSEGNO
@@ -453,9 +451,7 @@ def merge_icd_seg_conseg(
         data = pd.concat(
             [
                 data,
-                pd.merge(
-                    con_data_no_icd, seg_data, left_on="CONSEGNO", right_on="SEGIDX"
-                ),
+                con_data_no_icd.merge(seg_data, left_on="CONSEGNO", right_on="SEGIDX"),
             ],
             sort=False,
         )
@@ -515,8 +511,8 @@ def add_extras(dframe: pd.DataFrame, inplace: bool = True) -> pd.DataFrame:
 
 def df(
     resdatafiles: ResdataFiles,
-    wellname: Optional[str] = None,
-    date: Optional[str] = None,
+    wellname: str | None = None,
+    date: str | None = None,
 ) -> pd.DataFrame:
     """Loop over an RFT file and construct a dataframe representation
     of the data, ordered by well and date.
@@ -549,8 +545,8 @@ def df(
         if "DEPTH" not in headers.index:
             logger.debug(
                 "Well %s has no data to extract at %s",
-                str(rftrecord["wellname"]),
-                str(rftrecord["date"]),
+                rftrecord["wellname"],
+                rftrecord["date"],
             )
             continue
 
@@ -625,7 +621,7 @@ def df(
     # interpreting columns with numbers as strings. An alternative
     # solution that keeps NaN would be to add a second row in the
     # output containing the datatype
-    rftdata_df.fillna(0, inplace=True)
+    rftdata_df = rftdata_df.fillna(0)
 
     # The HOSTGRID data seems often to be empty, check if it is and delete if so:
     if (
@@ -674,9 +670,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
 
 def rft_main(args) -> None:
     """Entry-point for module, for command line utility"""
-    logger = getLogger_res2csv(  # pylint: disable=redefined-outer-name
-        __name__, vars(args)
-    )
+    logger = getLogger_res2csv(__name__, vars(args))
     if args.DATAFILE.endswith(".RFT"):
         # Support the RFT file as an argument also:
         resdatafiles = ResdataFiles(args.DATAFILE.replace(".RFT", "") + ".DATA")