res2df 1.3.9__py3-none-any.whl → 1.3.11__py3-none-any.whl

res2df/__init__.py

@@ -1,5 +1,22 @@
-import importlib
-
+from . import compdat as compdat
+from . import csv2res as csv2res
+from . import equil as equil
+from . import faults as faults
+from . import fipreports as fipreports
+from . import grid as grid
+from . import gruptree as gruptree
+from . import nnc as nnc
+from . import pillars as pillars
+from . import pvt as pvt
+from . import res2csv as res2csv
+from . import rft as rft
+from . import satfunc as satfunc
+from . import summary as summary
+from . import trans as trans
+from . import vfp as vfp
+from . import wcon as wcon
+from . import wellcompletiondata as wellcompletiondata
+from . import wellconnstatus as wellconnstatus
 from .__version__ import __version__ as __version__
 from .res2csvlogger import getLogger_res2csv as getLogger_res2csv
 from .resdatafiles import ResdataFiles as ResdataFiles
@@ -25,5 +42,27 @@ SUBMODULES: list[str] = [
 ]
 
 
-for submodule in [*SUBMODULES, "res2csv", "csv2res"]:
-    importlib.import_module("res2df." + submodule)
+__all__ = [
+    "ResdataFiles",
+    "__version__",
+    "compdat",
+    "csv2res",
+    "equil",
+    "faults",
+    "fipreports",
+    "getLogger_res2csv",
+    "grid",
+    "gruptree",
+    "nnc",
+    "pillars",
+    "pvt",
+    "res2csv",
+    "rft",
+    "satfunc",
+    "summary",
+    "trans",
+    "vfp",
+    "wcon",
+    "wellcompletiondata",
+    "wellconnstatus",
+]

res2df/__version__.py

@@ -1,5 +1,5 @@
 try:
-    from .version import version  # type: ignore
+    from .version import version
 
     __version__ = version
 except ImportError:

res2df/common.py

@@ -11,28 +11,24 @@ import shlex
 import signal
 import sys
 from collections import defaultdict
+from collections.abc import Mapping
 from importlib import resources
 from pathlib import Path
 from typing import Any, cast
 
 import dateutil.parser
 import numpy as np
+import opm.io.deck
 import pandas as pd
 import pyarrow as pa
+
+# This import is seemingly not used, but necessary for some attributes
+# to be included in DeckItem objects.
+from opm.io.deck import DeckKeyword  # noqa: F401
 from pyarrow import (
     feather,  # necessary as this module is not loaded unless explicitly imported
 )
 
-try:
-    import opm.io.deck
-
-    # This import is seemingly not used, but necessary for some attributes
-    # to be included in DeckItem objects.
-    from opm.io.deck import DeckKeyword  # noqa: F401
-except ImportError:
-    # Allow parts of res2df to work without OPM:
-    pass
-
 from .__version__ import __version__
 from .constants import MAGIC_STDOUT
 
@@ -189,9 +185,9 @@ def datetime_to_ecldate(timestamp: str | datetime.datetime | datetime.date) -> s
 
 
 def keyworddata_to_df(
-    deck,
+    deck: "opm.opmcommon_python.Deck",
     keyword: str,
-    renamer: dict[str, str | list[str]] | None = None,
+    renamer: Mapping[str, str | list[str]] | None = None,
     recordcountername: str | None = None,
     emptyrecordcountername: str | None = None,
 ) -> pd.DataFrame:
@@ -275,7 +271,7 @@ def parse_opmio_deckrecord(
     keyword: str,
     itemlistname: str = "items",
     recordindex: int | None = None,
-    renamer: dict[str, str] | dict[str, str | list[str]] | None = None,
+    renamer: Mapping[str, str | list[str]] | None = None,
 ) -> dict[str, Any]:
     """
     Parse an opm.io.DeckRecord belonging to a certain keyword
@@ -344,8 +340,9 @@ def parse_opmio_deckrecord(
     if renamer:
         renamed_dict: dict[str, Any] = {}
         for key, value in rec_dict.items():
-            if key in renamer and not isinstance(renamer[key], list):
-                renamed_dict[renamer[key]] = value  # type: ignore
+            renamed_key = renamer.get(key)
+            if isinstance(renamed_key, str):
+                renamed_dict[renamed_key] = value
             else:
                 renamed_dict[key] = value
         return renamed_dict
@@ -470,7 +467,7 @@ def handle_wanted_keywords(
 
 def fill_reverse_parser(
     parser: argparse.ArgumentParser, modulename: str, defaultoutputfile: str
-):
+) -> argparse.ArgumentParser:
     """A standardized submodule parser for the command line utility
        to produce :term:`include files <include file>` from a CSV file.
 
@@ -543,6 +540,7 @@ def df2res(
     """
     from_module = inspect.stack()[1]
     calling_module = inspect.getmodule(from_module[0])
+    assert calling_module is not None
     if dataframe.empty:
         raise ValueError("Empty dataframe")
     if (
@@ -580,7 +578,7 @@ def df2res(
         if not_supported:
             logger.warning(
                 "Requested keyword(s) not supported by %s: %s",
-                calling_module.__name__,  # type: ignore
+                calling_module.__name__,
                 not_supported,
             )
         # Warn if some requested keywords are not in frame:
@@ -601,7 +599,7 @@ def df2res(
     string = ""
     res2df_header = (
         "Output file printed by "
-        + calling_module.__name__  # type: ignore
+        + calling_module.__name__
         + " "
         + __version__
         + "\n"
@@ -631,7 +629,7 @@ def generic_deck_table(
     dframe: pd.DataFrame,
     keyword: str,
     comment: str | None = None,
-    renamer: dict[str, str] | None = None,
+    renamer: Mapping[str, str] | None = None,
     drop_trailing_columns: bool = True,
 ) -> str:
     """Construct string contents of a :term:`.DATA file` table.
@@ -855,7 +853,7 @@ def is_color(input_string: str) -> bool:
     return bool(re.match(regex, input_string))
 
 
-def parse_lyrfile(filename: str) -> list[dict[str, Any]] | None:
+def parse_lyrfile(filename: str | Path) -> list[dict[str, Any]] | None:
     """Return a list of dicts representation of the lyr file.
 
     The lyr file contains data of the following format,
@@ -927,7 +925,9 @@ def parse_lyrfile(filename: str) -> list[dict[str, Any]] | None:
     return lyrlist
 
 
-def convert_lyrlist_to_zonemap(lyrlist: list[dict[str, Any]]) -> dict[int, str]:
+def convert_lyrlist_to_zonemap(
+    lyrlist: list[dict[str, Any]] | None,
+) -> dict[int, str] | None:
     """Returns a layer to zone map as a dictionary
 
     Args:
@@ -949,7 +949,7 @@ def convert_lyrlist_to_zonemap(lyrlist: list[dict[str, Any]]) -> dict[int, str]:
     return zonemap
 
 
-def get_wells_matching_template(template: str, wells: list):
+def get_wells_matching_template(template: str, wells: list[str]) -> list[str]:
     """Returns the wells in the list that is matching the template
     containing wilcard characters. The wildcard charachters supported
     are * to match zero or more charachters and ? to match a single
@@ -972,9 +972,6 @@ def get_wells_matching_template(template: str, wells: list):
             "Well template not allowed to start with a wildcard character: "
             f"Must be preceded with a \\: {template}"
         )
-    if template.startswith("\\"):
-        # Note that the two \\ are actually read as one and
-        # this will return True for f.ex '\*P1'
-        template = template[1:]
+    template = template.removeprefix("\\")
     regex = template.replace("*", ".*").replace("?", ".")
     return [well for well in wells if bool(re.match(regex, well))]

res2df/compdat.py

@@ -11,16 +11,14 @@
 """
 
 import argparse
-import contextlib
 import datetime
 import logging
+from typing import Any
 
 import numpy as np
+import opm.io.deck
 import pandas as pd
 
-with contextlib.suppress(ImportError):
-    import opm.io.deck
-
 from .common import (
     get_wells_matching_template,
     merge_zones,
@@ -97,6 +95,7 @@ def deck2dfs(
     complumprecords = []
     welspecs = {}
     date = start_date  # DATE column will always be there, but can contain NaN/None
+    rec_data: dict[str, Any]
     for idx, kword in enumerate(deck):
         if kword.name in ["DATES", "START"]:
             for rec in kword:
@@ -752,7 +751,7 @@ def expand_complump_in_welopen_df(
                 exp_welopens.append(cell_row)
 
     dframe = pd.DataFrame(exp_welopens)
-    return dframe.astype(object).where(pd.notna(dframe), None)
+    return dframe.astype(object).where(pd.notna(dframe), None)  # type: ignore[call-overload]
 
 
 def expand_wlist_in_welopen_df(
@@ -786,7 +785,7 @@ def expand_wlist_in_welopen_df(
             # Explicit wellname was used, no expansion to happen:
             exp_welopens.append(row)
     dframe = pd.DataFrame(exp_welopens)
-    return dframe.astype(object).where(pd.notna(dframe), None)
+    return dframe.astype(object).where(pd.notna(dframe), None)  # type: ignore[call-overload]
 
 
 def applywelopen(
@@ -845,7 +844,7 @@ def applywelopen(
                 "The WLIST dataframe must be expanded through expand_wlist()"
             )
 
-    welopen_df = welopen_df.astype(object).where(pd.notna(welopen_df), None)
+    welopen_df = welopen_df.astype(object).where(pd.notna(welopen_df), None)  # type: ignore[call-overload]
     if wlist_df is not None:
         welopen_df = expand_wlist_in_welopen_df(welopen_df, wlist_df)
     if complump_df is not None:
@@ -951,7 +950,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
     return parser
 
 
-def compdat_main(args):
+def compdat_main(args: argparse.Namespace) -> None:
     """Entry-point for module, for command line utility"""
     logger = getLogger_res2csv(__name__, vars(args))
     resdatafiles = ResdataFiles(args.DATAFILE)

res2df/csv2res.py

@@ -34,7 +34,7 @@ def get_parser() -> argparse.ArgumentParser:
         version=f"%(prog)s {__version__}",
     )
 
-    subparsers = parser.add_subparsers(  # type: ignore
+    subparsers = parser.add_subparsers(
         required=True,
         dest="subcommand",
         parser_class=argparse.ArgumentParser,

res2df/equil.py

@@ -3,11 +3,12 @@ Extract EQUIL from a :term:`.DATA file` as Pandas DataFrame
 """
 
 import argparse
-import contextlib
 import logging
 from collections.abc import Container
 from pathlib import Path
+from typing import Final
 
+import opm.io
 import pandas as pd
 
 from .common import (
@@ -24,57 +25,56 @@ from .inferdims import DIMS_POS, inject_xxxdims_ntxxx
 from .res2csvlogger import getLogger_res2csv
 from .resdatafiles import ResdataFiles
 
-with contextlib.suppress(ImportError):
-    import opm.io
-
-
 logger = logging.getLogger(__name__)
 
-SUPPORTED_KEYWORDS: list[str] = ["EQUIL", "PBVD", "PDVD", "RSVD", "RVVD"]
-RENAMERS: dict[str, dict[str, str | list[str]]] = {}
-RENAMERS["PBVD"] = {"DATA": ["Z", "PB"]}
-RENAMERS["PDVD"] = {"DATA": ["Z", "PD"]}
-RENAMERS["RSVD"] = {"DATA": ["Z", "RS"]}
-RENAMERS["RVVD"] = {"DATA": ["Z", "RV"]}
-RENAMERS["oil-water-gas"] = {
-    "DATUM_DEPTH": "Z",
-    "DATUM_PRESSURE": "PRESSURE",
-    "OWC": "OWC",
-    "PC_OWC": "PCOWC",
-    "GOC": "GOC",
-    "PC_GOC": "PCGOC",
-    "BLACK_OIL_INIT": "INITRS",
-    "BLACK_OIL_INIT_WG": "INITRV",
-}
-RENAMERS["gas-water"] = {
-    "DATUM_DEPTH": "Z",
-    "DATUM_PRESSURE": "PRESSURE",
-    "OWC": "GWC",
-    "PC_OWC": "PCGWC",
-    "GOC": "IGNORE1",
-    "PC_GOC": "IGNORE2",
-    "BLACK_OIL_INIT": "IGNORE3",
-    "BLACK_OIL_INIT_WG": "IGNORE4",
-}
-RENAMERS["oil-water"] = {
-    "DATUM_DEPTH": "Z",
-    "DATUM_PRESSURE": "PRESSURE",
-    "OWC": "OWC",
-    "PC_OWC": "PCOWC",
-    "GOC": "IGNORE1",
-    "PC_GOC": "IGNORE2",
-    "BLACK_OIL_INIT": "IGNORE3",
-    "BLACK_OIL_INIT_WG": "IGNORE4",
+SUPPORTED_KEYWORDS: Final[list[str]] = ["EQUIL", "PBVD", "PDVD", "RSVD", "RVVD"]
+TABLE_RENAMERS: Final[dict[str, dict[str, list[str]]]] = {
+    "PBVD": {"DATA": ["Z", "PB"]},
+    "PDVD": {"DATA": ["Z", "PD"]},
+    "RSVD": {"DATA": ["Z", "RS"]},
+    "RVVD": {"DATA": ["Z", "RV"]},
 }
-RENAMERS["oil-gas"] = {
-    "DATUM_DEPTH": "Z",
-    "DATUM_PRESSURE": "PRESSURE",
-    "OWC": "IGNORE1",
-    "PC_OWC": "IGNORE2",
-    "GOC": "GOC",
-    "PC_GOC": "PCGOC",
-    "BLACK_OIL_INIT": "IGNORE3",
-    "BLACK_OIL_INIT_WG": "IGNORE4",
+PHASE_RENAMERS: Final[dict[str, dict[str, str]]] = {
+    "oil-water-gas": {
+        "DATUM_DEPTH": "Z",
+        "DATUM_PRESSURE": "PRESSURE",
+        "OWC": "OWC",
+        "PC_OWC": "PCOWC",
+        "GOC": "GOC",
+        "PC_GOC": "PCGOC",
+        "BLACK_OIL_INIT": "INITRS",
+        "BLACK_OIL_INIT_WG": "INITRV",
+    },
+    "gas-water": {
+        "DATUM_DEPTH": "Z",
+        "DATUM_PRESSURE": "PRESSURE",
+        "OWC": "GWC",
+        "PC_OWC": "PCGWC",
+        "GOC": "IGNORE1",
+        "PC_GOC": "IGNORE2",
+        "BLACK_OIL_INIT": "IGNORE3",
+        "BLACK_OIL_INIT_WG": "IGNORE4",
+    },
+    "oil-water": {
+        "DATUM_DEPTH": "Z",
+        "DATUM_PRESSURE": "PRESSURE",
+        "OWC": "OWC",
+        "PC_OWC": "PCOWC",
+        "GOC": "IGNORE1",
+        "PC_GOC": "IGNORE2",
+        "BLACK_OIL_INIT": "IGNORE3",
+        "BLACK_OIL_INIT_WG": "IGNORE4",
+    },
+    "oil-gas": {
+        "DATUM_DEPTH": "Z",
+        "DATUM_PRESSURE": "PRESSURE",
+        "OWC": "IGNORE1",
+        "PC_OWC": "IGNORE2",
+        "GOC": "GOC",
+        "PC_GOC": "PCGOC",
+        "BLACK_OIL_INIT": "IGNORE3",
+        "BLACK_OIL_INIT_WG": "IGNORE4",
+    },
 }
 
 
@@ -149,7 +149,7 @@ def rsvd_fromdeck(
     if "EQLDIMS" not in deck:
         deck = inject_xxxdims_ntxxx("EQLDIMS", "NTEQUL", deck, ntequl)
     return keyworddata_to_df(
-        deck, "RSVD", renamer=RENAMERS["RSVD"], recordcountername="EQLNUM"
+        deck, "RSVD", renamer=TABLE_RENAMERS["RSVD"], recordcountername="EQLNUM"
     )
 
 
@@ -166,7 +166,7 @@ def rvvd_fromdeck(
     if "EQLDIMS" not in deck:
         deck = inject_xxxdims_ntxxx("EQLDIMS", "NTEQUL", deck, ntequl)
     return keyworddata_to_df(
-        deck, "RVVD", renamer=RENAMERS["RVVD"], recordcountername="EQLNUM"
+        deck, "RVVD", renamer=TABLE_RENAMERS["RVVD"], recordcountername="EQLNUM"
     )
 
 
@@ -183,7 +183,7 @@ def pbvd_fromdeck(
     if "EQLDIMS" not in deck:
         deck = inject_xxxdims_ntxxx("EQLDIMS", "NTEQUL", deck, ntequl)
     return keyworddata_to_df(
-        deck, "PBVD", renamer=RENAMERS["PBVD"], recordcountername="EQLNUM"
+        deck, "PBVD", renamer=TABLE_RENAMERS["PBVD"], recordcountername="EQLNUM"
     )
 
 
@@ -200,7 +200,7 @@ def pdvd_fromdeck(
     if "EQLDIMS" not in deck:
         deck = inject_xxxdims_ntxxx("EQLDIMS", "NTEQUL", deck, ntequl)
     return keyworddata_to_df(
-        deck, "PDVD", renamer=RENAMERS["PDVD"], recordcountername="EQLNUM"
+        deck, "PDVD", renamer=TABLE_RENAMERS["PDVD"], recordcountername="EQLNUM"
     )
 
 
@@ -267,9 +267,9 @@ def equil_fromdeck(
         deck = inject_xxxdims_ntxxx("EQLDIMS", "NTEQUL", deck, ntequl)
 
     phases = phases_from_deck(deck)
-    if not phases or phases not in RENAMERS:
+    if not phases or phases not in PHASE_RENAMERS:
         raise ValueError(f"Could not determine phase configuration, got '{phases}'")
-    columnrenamer = RENAMERS[phases_from_deck(deck)]
+    columnrenamer = PHASE_RENAMERS[phases]
 
     dataframe = keyworddata_to_df(
         deck, "EQUIL", renamer=columnrenamer, recordcountername="EQLNUM"
@@ -318,7 +318,7 @@ def fill_reverse_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentPar
     return common_fill_reverse_parser(parser, "EQUIL, RSVD++", "solution.inc")
 
 
-def equil_main(args) -> None:
+def equil_main(args: argparse.Namespace) -> None:
     """Read from disk and write CSV back to disk"""
     logger = getLogger_res2csv(__name__, vars(args))
     resdatafiles = ResdataFiles(args.DATAFILE)
@@ -348,7 +348,7 @@ def equil_main(args) -> None:
     )
 
 
-def equil_reverse_main(args) -> None:
+def equil_reverse_main(args: argparse.Namespace) -> None:
     """Entry-point for module, for command line utility
     for CSV to reservoir simulator :term:`include files <include file>`
     """
@@ -424,7 +424,7 @@ def df2res_equil(dframe: pd.DataFrame, comment: str | None = None) -> str:
     return generic_deck_table(
         subset,
         "EQUIL",
-        renamer=RENAMERS[phases],  # type: ignore
+        renamer=PHASE_RENAMERS[phases],
         comment=comment,
         drop_trailing_columns=False,
     )
@@ -471,7 +471,7 @@ def df2res_pbvd(dframe: pd.DataFrame, comment: str | None = None) -> str:
     return _df2res_equilfuncs("PBVD", dframe, comment)
 
 
-def df2res_pdvd(dframe: pd.DataFrame, comment: str | None = None):
+def df2res_pdvd(dframe: pd.DataFrame, comment: str | None = None) -> str:
     """Create string with :term:`include file` contents for PDVD keyword.
 
     Dew-point versus depth.
@@ -494,7 +494,7 @@ def _df2res_equilfuncs(
         return "-- No data!"
     string = f"{keyword}\n"
     string += comment_formatter(comment)
-    col_headers = RENAMERS[keyword]["DATA"]
+    col_headers = TABLE_RENAMERS[keyword]["DATA"]
 
     string += f"--   {'DEPTH':^21} {col_headers[1]:^21} \n"
     # Use everything if KEYWORD not in dframe..

res2df/faults.py

@@ -6,20 +6,17 @@ a DataFrame
 """
 
 import argparse
-import contextlib
 import logging
+from itertools import product
 
+# Needed for mypy
+import opm.io
 import pandas as pd
 
 from .common import parse_opmio_deckrecord, write_dframe_stdout_file
 from .res2csvlogger import getLogger_res2csv
 from .resdatafiles import ResdataFiles
 
-with contextlib.suppress(ImportError):
-    # Needed for mypy
-    import opm.io
-
-
 logger = logging.getLogger(__name__)
 
 RECORD_COLUMNS = ["NAME", "IX1", "IX2", "IY1", "IY2", "IZ1", "IZ2", "FACE"]
@@ -40,7 +37,7 @@ def df(deck: "ResdataFiles | opm.opmcommon_python.Deck") -> pd.DataFrame:
 
     # In[91]: list(deck['FAULTS'][0])
     # Out[91]: [[u'F1'], [36], [36], [41], [42], [1], [14], [u'I']]
-    data = []
+    data: list[list[str | int]] = []
     # It is allowed in Eclipse to use the keyword FAULTS
     # as many times as needed. Thus we need to loop in some way:
     for keyword in deck:
@@ -51,10 +48,13 @@ def df(deck: "ResdataFiles | opm.opmcommon_python.Deck") -> pd.DataFrame:
                 frec_dict = parse_opmio_deckrecord(rec, "FAULTS")
                 faultname = frec_dict["NAME"]
                 faultface = frec_dict["FACE"]
-                for i_idx in range(frec_dict["IX1"], frec_dict["IX2"] + 1):
-                    for j_idx in range(frec_dict["IY1"], frec_dict["IY2"] + 1):
-                        for k_idx in range(frec_dict["IZ1"], frec_dict["IZ2"] + 1):
-                            data.append([faultname, i_idx, j_idx, k_idx, faultface])
+
+                indices = product(
+                    range(frec_dict["IX1"], frec_dict["IX2"] + 1),
+                    range(frec_dict["IY1"], frec_dict["IY2"] + 1),
+                    range(frec_dict["IZ1"], frec_dict["IZ2"] + 1),
+                )
+                data.extend([faultname, i, j, k, faultface] for i, j, k in indices)
     dframe = pd.DataFrame(columns=COLUMNS, data=data)
     logger.info("Extracted %i faults", len(dframe["NAME"].unique()))
     return dframe
@@ -80,7 +80,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
     return parser
 
 
-def faults_main(args) -> None:
+def faults_main(args: argparse.Namespace) -> None:
     """Read from disk and write CSV back to disk"""
     logger = getLogger_res2csv(__name__, vars(args))
     resdatafiles = ResdataFiles(args.DATAFILE)

res2df/fipreports.py

@@ -4,6 +4,7 @@ import argparse
 import datetime
 import logging
 import re
+from pathlib import Path
 
 import numpy as np
 import pandas as pd
@@ -133,7 +134,7 @@ def df(prtfile: str | ResdataFiles, fipname: str = "FIPNUM") -> pd.DataFrame:
         ".+" + fipname + r"\s+REPORT\s+REGION\s+(\d+)", re.IGNORECASE
     )
 
-    with open(prtfile, encoding="utf-8") as prt_fh:
+    with Path(prtfile).open(encoding="utf-8") as prt_fh:
         logger.info(
             "Parsing file %s for blocks starting with %s REPORT REGION",
             prtfile,
@@ -207,7 +208,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
     return parser
 
 
-def fipreports_main(args) -> None:
+def fipreports_main(args: argparse.Namespace) -> None:
     """Command line API"""
     logger = getLogger_res2csv(__name__, vars(args))
     if args.PRTFILE.endswith(".PRT"):

res2df/grid.py

@@ -481,7 +481,7 @@ def df(
     dateinheaders: bool = False,
     stackdates: bool = False,
     zonemap: dict[int, str] | None = None,
-):
+) -> pd.DataFrame:
     """Produce a dataframe with grid information
 
     Grid information (center coordinates x, y, z), cell
@@ -544,7 +544,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
     parser.add_argument(
         "DATAFILE",
         help="Name of the .DATA input file for the reservoir simulator."
-        + " There must exist .INIT and .EGRID files with the same path and basename.",
+        " There must exist .INIT and .EGRID files with the same path and basename.",
     )
     parser.add_argument(
         "--vectors",
@@ -556,8 +556,8 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
         "--rstdates",
         type=str,
         help="Point in time to grab restart data from, "
-        + "either 'first' or 'last', 'all', or a date in "
-        + "YYYY-MM-DD format",
+        "either 'first' or 'last', 'all', or a date in "
+        "YYYY-MM-DD format",
         default="",
     )
     parser.add_argument(
@@ -610,10 +610,11 @@ def drop_constant_columns(
     if dframe.empty:
         return dframe
 
-    columnstodelete = []
-    for col in set(dframe.columns) - set(alwayskeep):
-        if len(dframe[col].unique()) == 1:
-            columnstodelete.append(col)
+    columnstodelete = [
+        col
+        for col in (set(dframe.columns) - set(alwayskeep))
+        if len(dframe[col].unique()) == 1
+    ]
     if columnstodelete:
         logging.info("Deleting constant columns %s", columnstodelete)
     return dframe.drop(columnstodelete, axis=1)
@@ -698,11 +699,7 @@ def df2res(
 
     res2df_header = (
         "Output file printed by "
-        + "res2df.grid "
-        + __version__
-        + "\n"
-        + " at "
-        + str(datetime.datetime.now())
+        "res2df.grid " + __version__ + "\n" + " at " + str(datetime.datetime.now())
     )
 
     string = ""
@@ -759,7 +756,7 @@ def df2res(
     return string
 
 
-def grid_main(args) -> None:
+def grid_main(args: argparse.Namespace) -> None:
     """This is the command line API"""
     logger = getLogger_res2csv(__name__, vars(args))
     resdatafiles = ResdataFiles(args.DATAFILE)