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

res2df/gruptree.py

@@ -2,7 +2,6 @@
 
 import argparse
 import collections
-import contextlib
 import datetime
 import logging
 import sys
@@ -10,13 +9,12 @@ import warnings
 from typing import Any
 
 import numpy as np
+
+# Needed for mypy
+import opm.io
 import pandas as pd
 import treelib
 
-with contextlib.suppress(ImportError):
-    # Needed for mypy
-    import opm.io
-
 from .common import (
     OPMKEYWORDS,
     parse_opmio_date_rec,
@@ -69,7 +67,7 @@ def df(
         deck = deck.get_deck()
 
     edgerecords = []  # list of dict of rows containing an edge.
-    nodedatarecords = []
+    nodedatarecords: list[dict[str, Any]] = []
 
     # In order for the GRUPTREE/BRANPROP keywords to accumulate, we
     # store the edges as dictionaries indexed by the edge
@@ -146,10 +144,10 @@ def df(
             renamer = (
                 {"PRESSURE": "TERMINAL_PRESSURE"} if kword.name == "NODEPROP" else None
             )
-            for rec in kword:
-                nodedatarecords.append(
-                    parse_opmio_deckrecord(rec, kword.name, renamer=renamer)
-                )
+            nodedatarecords.extend(
+                parse_opmio_deckrecord(rec, kword.name, renamer=renamer)
+                for rec in kword
+            )
             nodedata[kword.name] = (
                 pd.DataFrame(nodedatarecords)
                 .drop_duplicates(subset="NAME", keep="last")
@@ -256,7 +254,7 @@ def _merge_edges_and_nodeinfo(
 
     # Write WELSPECS edges
     welspecs_parents = set()
-    for (child, parent), _ in wellspecsedges.items():
+    for child, parent in wellspecsedges:  # noqa: PLE1141
         # For BRANPROP trees, only wells with a parent in the tree are added
         if (treetype == "BRANPROP" and parent in childs) or (treetype == "GRUPTREE"):
             rec_dict = {
@@ -457,7 +455,7 @@ def prettyprint(dframe: pd.DataFrame) -> str:
     return output
 
 
-def gruptree_main(args) -> None:
+def gruptree_main(args: argparse.Namespace) -> None:
     """Entry-point for module, for command line utility."""
     logger = getLogger_res2csv(__name__, vars(args))
     if not args.output and not args.prettyprint:

res2df/hook_implementations/forward_model_steps.py

@@ -1,31 +1,34 @@
 import shutil
+from collections.abc import Callable
+from typing import Any, ParamSpec
 
+P = ParamSpec("P")
 try:
-    from ert import (  # type: ignore
+    from ert import (
         ForwardModelStepDocumentation,
         ForwardModelStepJSON,
         ForwardModelStepPlugin,
         ForwardModelStepValidationError,
     )
-    from ert import plugin as ert_plugin  # type: ignore
+    from ert import plugin as ert_plugin
 except ModuleNotFoundError:
     # ert is not installed, use dummy/transparent function decorator:
-    def ert_plugin(name: str = ""):
-        def decorator(func):
+    def ert_plugin(name: str = "") -> Callable[[Callable[P, Any]], Callable[P, Any]]:
+        def decorator(func: Callable[P, Any]) -> Callable[P, Any]:
             return func
 
         return decorator
 
-    class ForwardModelStepDocumentation:  # type: ignore
+    class ForwardModelStepDocumentation:  # type: ignore[no-redef]
         pass
 
-    class ForwardModelStepJSON:  # type: ignore
+    class ForwardModelStepJSON:  # type: ignore[no-redef]
         pass
 
-    class ForwardModelStepPlugin:  # type: ignore
+    class ForwardModelStepPlugin:  # type: ignore[no-redef]
         pass
 
-    class ForwardModelStepValidationError:  # type: ignore
+    class ForwardModelStepValidationError:  # type: ignore[no-redef]
         pass
 
 

res2df/inferdims.py

@@ -3,12 +3,9 @@ Support module for inferring EQLDIMS and TABDIMS from incomplete
 reservoir simulator decks (typically single include-files)
 """
 
-import contextlib
 import logging
 
-with contextlib.suppress(ImportError):
-    import opm.io
-    # Let parts of res2df work without OPM:
+import opm.io
 
 from .resdatafiles import ResdataFiles
 
@@ -41,7 +38,7 @@ def guess_dim(deckstring: str, dimkeyword: str, dimitem: int = 0) -> int:
         raise ValueError("Only supports TABDIMS and EQLDIMS")
     if dimkeyword == "TABDIMS" and dimitem not in [0, 1]:
         raise ValueError("Only support item 0 and 1 in TABDIMS")
-    if dimkeyword == "EQLDIMS" and dimitem not in [0]:
+    if dimkeyword == "EQLDIMS" and dimitem != 0:
         raise ValueError("Only item 0 in EQLDIMS can be estimated")
 
     # A less than res2df-standard permissive opm.io, when using
@@ -115,7 +112,7 @@ def inject_dimcount(
         raise ValueError("Only supports TABDIMS and EQLDIMS")
     if dimkeyword == "TABDIMS" and dimitem not in [0, 1]:
         raise ValueError("Only support item 0 and 1 in TABDIMS")
-    if dimkeyword == "EQLDIMS" and dimitem not in [0]:
+    if dimkeyword == "EQLDIMS" and dimitem != 0:
         raise ValueError("Only item 0 in EQLDIMS can be injected")
 
     if dimkeyword in deckstr:

res2df/nnc.py

@@ -181,7 +181,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(
         "-c",
@@ -242,11 +242,7 @@ def df2res_editnnc(
     string = ""
     res2df_header = (
         "Output file printed by res2df.nnc"
-        + " "
-        + __version__
-        + "\n"
-        + " at "
-        + str(datetime.datetime.now())
+        " " + __version__ + "\n" + " at " + str(datetime.datetime.now())
     )
     if not nocomments:
         string += comment_formatter(res2df_header)
@@ -280,7 +276,7 @@ def df2res_editnnc(
     return string
 
 
-def nnc_main(args) -> None:
+def nnc_main(args: argparse.Namespace) -> None:
     """Command line access point from main() or from res2csv via subparser"""
     logger = getLogger_res2csv(__name__, vars(args))
     resdatafiles = ResdataFiles(args.DATAFILE)

res2df/parameters.py

@@ -47,7 +47,7 @@ def find_parameter_files(
         filebase + ".txt",
         filebase,
     ]
-    paths_to_check: list[Path] = [Path("."), Path(".."), Path("..") / Path("..")]
+    paths_to_check: list[Path] = [Path(), Path(".."), Path("..") / Path("..")]
     foundfiles = []
     for path in paths_to_check:
         for fname in files_to_lookfor:
@@ -147,7 +147,7 @@ def load(filename: str | Path) -> dict[str, Any]:
     if not params_dict:
         try:
             logger.debug("Trying to parse %s with json.load()", filename)
-            with open(filename, encoding="utf-8") as f_handle:
+            with Path(filename).open(encoding="utf-8") as f_handle:
                 params_dict = json.load(f_handle)
             assert isinstance(params_dict, dict)
             logger.debug(" - ok, parsed as yaml")

res2df/pillars.py

@@ -109,7 +109,7 @@ def df(
 
     aggregators = {
         key: AGGREGATORS[key.split("@")[0]]
-        for key in grid_df
+        for key in grid_df.columns
         if key.split("@")[0] in AGGREGATORS
     }
 
@@ -327,7 +327,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(
         "--region",
@@ -406,7 +406,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
     return parser
 
 
-def pillars_main(args) -> None:
+def pillars_main(args: argparse.Namespace) -> None:
     """This is the command line API"""
     logger = getLogger_res2csv(__name__, vars(args))
 

res2df/pvt.py

@@ -5,11 +5,12 @@ Data can be extracted from a complete deck or from individual files.
 """
 
 import argparse
-import contextlib
 import logging
 from pathlib import Path
 from typing import cast
 
+# Needed for mypy
+import opm.io
 import pandas as pd
 
 from .common import (
@@ -25,11 +26,6 @@ from .inferdims import DIMS_POS, inject_xxxdims_ntxxx
 from .res2csvlogger import getLogger_res2csv
 from .resdatafiles import ResdataFiles
 
-with contextlib.suppress(ImportError):
-    # Needed for mypy
-    import opm.io
-
-
 logger: logging.Logger = logging.getLogger(__name__)
 
 SUPPORTED_KEYWORDS: list[str] = [
@@ -256,7 +252,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
     parser.add_argument(
         "DATAFILE",
         help="Name of the .DATA input file for the reservoir simulator,"
-        + " or file with PVT keywords.",
+        " or file with PVT keywords.",
     )
     parser.add_argument(
         "-o",
@@ -288,7 +284,7 @@ def fill_reverse_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentPar
     return common_fill_reverse_parser(parser, "PVT", "pvt.inc")
 
 
-def pvt_main(args) -> None:
+def pvt_main(args: argparse.Namespace) -> None:
     """Entry-point for module, for command line utility for Eclipse to CSV"""
     logger = getLogger_res2csv(__name__, vars(args))
     resdatafiles = ResdataFiles(args.DATAFILE)
@@ -320,7 +316,7 @@ def pvt_main(args) -> None:
     )
 
 
-def pvt_reverse_main(args) -> None:
+def pvt_reverse_main(args: argparse.Namespace) -> None:
     """Entry-point for module, for command line utility for CSV to simulator
     :term:`deck`"""
     logger = getLogger_res2csv(__name__, vars(args))
@@ -469,7 +465,7 @@ def df2res_pvtg(dframe: pd.DataFrame, comment: str | None = None) -> str:
         subset["PVTNUM"] = 1
     subset = subset.set_index("PVTNUM").sort_index()
 
-    def _pvtg_pvtnum(dframe):
+    def _pvtg_pvtnum(dframe: pd.DataFrame) -> str:
         """Create string with :term:`include file` contents for
         PVTG-data with a specific PVTNUM"""
         string = ""
@@ -478,7 +474,7 @@ def df2res_pvtg(dframe: pd.DataFrame, comment: str | None = None) -> str:
             string += _pvtg_pvtnum_pg(dframe[dframe.index == p_gas])
         return string + "/\n"
 
-    def _pvtg_pvtnum_pg(dframe):
+    def _pvtg_pvtnum_pg(dframe: pd.DataFrame) -> str:
         """Create string with :term:`include file` contents for
         PVTG-data with a particular gas phase pressure"""
         string = ""
@@ -486,6 +482,7 @@ def df2res_pvtg(dframe: pd.DataFrame, comment: str | None = None) -> str:
         p_gas = dframe.index.to_numpy()[0]
         string += f"{p_gas:20.7f}  "
         for rowidx, row in dframe.reset_index().iterrows():
+            rowidx = cast(int, rowidx)
             indent = "\n" + " " * 22 if rowidx > 0 else ""
             string += (
                 indent
@@ -523,7 +520,7 @@ def df2res_pvdg(dframe: pd.DataFrame, comment: str | None = None) -> str:
             return ""
         subset["PVTNUM"] = 1
 
-    def _pvdg_pvtnum(dframe):
+    def _pvdg_pvtnum(dframe: pd.DataFrame) -> str:
         """Create string with :term:`include file` contents for
         PVDG-data with a specific PVTNUM
 

res2df/res2csv.py

@@ -24,7 +24,7 @@ def get_parser() -> argparse.ArgumentParser:
         "--version", action="version", version=f"%(prog)s {__version__}"
     )
 
-    subparsers = parser.add_subparsers(  # type: ignore
+    subparsers = parser.add_subparsers(
         required=True,
         dest="subcommand",
         parser_class=argparse.ArgumentParser,
@@ -203,9 +203,7 @@ def get_parser() -> argparse.ArgumentParser:
     for submodule, subparser in subparsers_dict.items():
         # Use the submodule's fill_parser() to add the submodule specific
         # arguments:
-        importlib.import_module("res2df." + submodule).fill_parser(  # type: ignore
-            subparser
-        )
+        importlib.import_module("res2df." + submodule).fill_parser(subparser)
 
         # Add empty placeholders, this looks strange but is needed for the
         # ERT forward model frontend, where non-used options must be supplied
@@ -226,7 +224,7 @@ def get_parser() -> argparse.ArgumentParser:
 
 
 def run_subparser_main(
-    args,
+    args: argparse.Namespace,
     submodule: str,
     parser: argparse.ArgumentParser | None = None,
 ) -> None:

res2df/resdatafiles.py

@@ -6,13 +6,7 @@ import os
 from pathlib import Path
 from typing import Any
 
-try:
-    import opm.io
-
-    HAVE_OPM = True
-except ImportError:
-    HAVE_OPM = False
-
+import opm.io
 from resdata.grid import Grid
 from resdata.rd_util import FileMode
 from resdata.resfile import ResdataFile
@@ -22,21 +16,20 @@ from .common import convert_lyrlist_to_zonemap, parse_lyrfile
 
 logger = logging.getLogger(__name__)
 
-if HAVE_OPM:
-    # Default parse option to opm.io for a very permissive parsing
-    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),
-        ("PARSE_MISSING_DIMS_KEYWORD", opm.io.action.ignore),
-        ("PARSE_MISSING_INCLUDE", opm.io.action.ignore),
-        ("PARSE_MISSING_SECTIONS", opm.io.action.ignore),
-        ("PARSE_RANDOM_SLASH", opm.io.action.ignore),
-        ("PARSE_RANDOM_TEXT", opm.io.action.ignore),
-        ("PARSE_UNKNOWN_KEYWORD", opm.io.action.ignore),
-        ("SUMMARY_UNKNOWN_GROUP", opm.io.action.ignore),
-        ("UNSUPPORTED_*", opm.io.action.ignore),
-    ]
+# Default parse option to opm.io for a very permissive parsing
+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),
+    ("PARSE_MISSING_DIMS_KEYWORD", opm.io.action.ignore),
+    ("PARSE_MISSING_INCLUDE", opm.io.action.ignore),
+    ("PARSE_MISSING_SECTIONS", opm.io.action.ignore),
+    ("PARSE_RANDOM_SLASH", opm.io.action.ignore),
+    ("PARSE_RANDOM_TEXT", opm.io.action.ignore),
+    ("PARSE_UNKNOWN_KEYWORD", opm.io.action.ignore),
+    ("SUMMARY_UNKNOWN_GROUP", opm.io.action.ignore),
+    ("UNSUPPORTED_*", opm.io.action.ignore),
+]
 
 
 class ResdataFiles:
@@ -52,7 +45,7 @@ class ResdataFiles:
     it should be loaded or served from cache.
     """
 
-    def __init__(self, eclbase):
+    def __init__(self, eclbase: str | Path) -> None:
         # eclbase might be a a Posix path object
         eclbase = str(eclbase)
 
@@ -211,7 +204,7 @@ class ResdataFiles:
         self._rstfile = None
         self._rftfile = None
 
-    def get_zonemap(self, filename=None):
+    def get_zonemap(self, filename: str | None = None) -> dict[int, str]:
         """Return a dictionary from (int) K layers in the simgrid to strings
 
         Typical usage is to map from grid layer to zone names.
@@ -243,15 +236,15 @@ class ResdataFiles:
         if not Path(filename).is_absolute():
             fullpath = Path(self.get_path()) / filename
         else:
-            fullpath = filename
-        if not Path(fullpath).is_file():
+            fullpath = Path(filename)
+        if not fullpath.is_file():
             if filename_defaulted:
                 # No warnings when the default filename is not there.
                 return {}
             logger.warning("Zonefile %s not found, ignoring", fullpath)
             return {}
         lyrlist = parse_lyrfile(fullpath)
-        return convert_lyrlist_to_zonemap(lyrlist)
+        return convert_lyrlist_to_zonemap(lyrlist) or {}
 
 
 def rreplace(pat: str, sub: str, string: str) -> str:

res2df/rft.py

@@ -667,7 +667,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
     return parser
 
 
-def rft_main(args) -> None:
+def rft_main(args: argparse.Namespace) -> None:
     """Entry-point for module, for command line utility"""
     logger = getLogger_res2csv(__name__, vars(args))
     if args.DATAFILE.endswith(".RFT"):

res2df/satfunc.py

@@ -14,15 +14,12 @@ TABDIMS or to supply the satnumcount directly to avoid possible bugs.
 """
 
 import argparse
-import contextlib
 import logging
 from pathlib import Path
 
+import opm.io
 import pandas as pd
 
-with contextlib.suppress(ImportError):
-    import opm.io
-
 from .common import (
     comment_formatter,
     handle_wanted_keywords,
@@ -106,15 +103,14 @@ def df(
 
     wanted_keywords = handle_wanted_keywords(keywords, deck, SUPPORTED_KEYWORDS)
 
-    frames = []
-    for keyword in wanted_keywords:
-        frames.append(
-            interpolate_defaults(
-                keyworddata_to_df(
-                    deck, keyword, renamer=RENAMERS[keyword], recordcountername="SATNUM"
-                ).assign(KEYWORD=keyword)
-            )
+    frames = [
+        interpolate_defaults(
+            keyworddata_to_df(
+                deck, keyword, renamer=RENAMERS[keyword], recordcountername="SATNUM"
+            ).assign(KEYWORD=keyword)
         )
+        for keyword in wanted_keywords
+    ]
     nonempty_frames = [frame for frame in frames if not frame.empty]
     if nonempty_frames:
         dframe = pd.concat(nonempty_frames, axis=0, sort=False, ignore_index=True)
@@ -170,7 +166,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
     parser.add_argument(
         "DATAFILE",
         help="Name of .DATA input file for the reservoir simulator,"
-        + " or file with saturation functions.",
+        " or file with saturation functions.",
     )
     parser.add_argument(
         "-o",
@@ -197,7 +193,7 @@ def fill_reverse_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentPar
     return common_fill_reverse_parser(parser, "SWOF, SGOF++", "relperm.inc")
 
 
-def satfunc_main(args) -> None:
+def satfunc_main(args: argparse.Namespace) -> None:
     """Entry-point for module, for command line utility"""
     logger = getLogger_res2csv(__name__, vars(args))
     resdatafiles = ResdataFiles(args.DATAFILE)
@@ -228,7 +224,7 @@ def satfunc_main(args) -> None:
     )
 
 
-def satfunc_reverse_main(args) -> None:
+def satfunc_reverse_main(args: argparse.Namespace) -> None:
     """For command line utility for CSV to resdata"""
     logger = getLogger_res2csv(__name__, vars(args))
     satfunc_df = pd.read_csv(args.csvfile)
@@ -368,7 +364,7 @@ def _df2res_satfuncs(
     subset = subset.set_index("SATNUM").sort_index()
 
     # Make a function that is to be called for each SATNUM
-    def _df2res_satfuncs_satnum(keyword, dframe):
+    def _df2res_satfuncs_satnum(keyword: str, dframe: pd.DataFrame) -> str:
         """Create string with :term:`include file` contents
         for one saturation function for one specific SATNUM"""
         col_headers = RENAMERS[keyword]["DATA"]

res2df/summary.py

@@ -80,7 +80,7 @@ def _ensure_date_or_none(some_date: str | dt.date | None) -> dt.date | None:
     if not some_date:
         return None
     if isinstance(some_date, str):
-        return dateutil.parser.parse(some_date).date()  # type: ignore
+        return dateutil.parser.parse(some_date).date()
     raise TypeError(f"some_date must be a string or a date, got {some_date}")
 
 
@@ -104,7 +104,7 @@ def _crop_datelist(
     Returns:
         list of datetimes.
     """
-    datetimes: list[dt.date] | list[dt.datetime] = []  # type: ignore
+    datetimes: list[dt.date] | list[dt.datetime] = []
     if freq == FREQ_RAW:
         datetimes = summarydates
         datetimes.sort()
@@ -153,9 +153,7 @@ def _fallback_date_roll(rollme: dt.datetime, direction: str, freq: str) -> dt.da
                 return dt.datetime(year=rollme.year, month=rollme.month, day=1)
             return dt.datetime(
                 year=rollme.year, month=rollme.month, day=1
-            ) + dateutil.relativedelta.relativedelta(  # type: ignore
-                months=1
-            )
+            ) + dateutil.relativedelta.relativedelta(months=1)
         return dt.datetime(year=rollme.year, month=rollme.month, day=1)
 
     raise ValueError(
@@ -188,7 +186,7 @@ def _fallback_date_range(start: dt.date, end: dt.date, freq: str) -> list[dt.dat
         enddatetime = dt.datetime.combine(end, dt.datetime.min.time())
         while date <= enddatetime:
             dates.append(date)
-            date += dateutil.relativedelta.relativedelta(months=1)  # type: ignore
+            date += dateutil.relativedelta.relativedelta(months=1)
         return dates
     raise ValueError("Unsupported frequency for datetimes beyond year 2262")
 
@@ -238,7 +236,7 @@ def resample_smry_dates(
 
     # In case freq is an ISO-date(time)-string, interpret as such:
     try:
-        parseddate = dateutil.parser.isoparse(freq)  # type: ignore
+        parseddate = dateutil.parser.isoparse(freq)
         return [parseddate]
     except ValueError:
         # freq is a frequency string or datetime.date (or similar)
@@ -301,7 +299,7 @@ def df(
     params: bool = False,
     paramfile: str | None = None,
     datetime: bool = False,  # A very poor choice of argument name [pylint]
-):
+) -> pd.DataFrame:
     """
     Extract data from UNSMRY as Pandas dataframes.
 
@@ -623,10 +621,7 @@ def _fix_dframe_for_resdata(dframe: pd.DataFrame) -> pd.DataFrame:
             # Do not use pd.Series.apply() here, Pandas would try to convert it to
             # datetime64[ns] which is limited at year 2262.
             dframe["DATE"] = pd.Series(
-                [
-                    dateutil.parser.parse(datestr)  # type: ignore
-                    for datestr in dframe["DATE"]
-                ],
+                [dateutil.parser.parse(datestr) for datestr in dframe["DATE"]],
                 dtype="object",
                 index=dframe.index,
             )
@@ -702,7 +697,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 a UNSMRY file with the same path and basename.",
+        " There must exist a UNSMRY file with the same path and basename.",
     )
     parser.add_argument(
         "--time_index",
@@ -794,7 +789,7 @@ def fill_reverse_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentPar
     return parser
 
 
-def summary_main(args) -> None:
+def summary_main(args: argparse.Namespace) -> None:
     """Read summary data from disk and write CSV back to disk"""
     logger = getLogger_res2csv(__name__, vars(args))
     eclbase = (
@@ -824,7 +819,7 @@ def summary_main(args) -> None:
     write_dframe_stdout_file(sum_df, args.output, index=True, caller_logger=logger)
 
 
-def summary_reverse_main(args) -> None:
+def summary_reverse_main(args: argparse.Namespace) -> None:
     """Entry point for usage with "csv2res summary" on the command line"""
     logger = getLogger_res2csv(__name__, vars(args))
 
@@ -835,7 +830,7 @@ def summary_reverse_main(args) -> None:
     eclbase = Path(args.output).name
 
     # Summary.fwrite() can only write to current directory:
-    cwd = os.getcwd()
+    cwd = Path.cwd()
     summary = df2ressum(summary_df, eclbase)
     try:
         os.chdir(outputdir)

res2df/trans.py

@@ -6,7 +6,7 @@ Extract transmissibility information from output files as Dataframes.
 import argparse
 import logging
 
-import networkx
+import networkx as nx
 import pandas as pd
 
 from .common import write_dframe_stdout_file
@@ -221,12 +221,12 @@ def df(
     return trans_df
 
 
-def make_nx_graph(resdatafiles: ResdataFiles, region: str = "FIPNUM") -> networkx.Graph:
+def make_nx_graph(resdatafiles: ResdataFiles, region: str = "FIPNUM") -> nx.Graph:
     """Construct a networkx graph for the transmissibilities."""
     trans_df = df(resdatafiles, vectors=[region], coords=True, group=True)
     reg1 = region + "1"
     reg2 = region + "2"
-    graph: networkx.Graph = networkx.Graph()
+    graph: nx.Graph = nx.Graph()
     graph.add_weighted_edges_from(
         [tuple(row) for row in trans_df[[reg1, reg2, "TRAN"]].to_numpy()]
     )
@@ -242,7 +242,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", nargs="+", help="Extra INIT vectors to be added")
     parser.add_argument(
@@ -284,7 +284,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
     return parser
 
 
-def trans_main(args):
+def trans_main(args: argparse.Namespace) -> None:
     """This is the command line API"""
     logger = getLogger_res2csv(__name__, vars(args))
     resdatafiles = ResdataFiles(args.DATAFILE)

res2df/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.3.9'
-__version_tuple__ = version_tuple = (1, 3, 9)
+__version__ = version = '1.3.11'
+__version_tuple__ = version_tuple = (1, 3, 11)
 
 __commit_id__ = commit_id = None