res2df 1.3.10__py3-none-any.whl → 1.3.12__py3-none-any.whl

res2df/common.py

@@ -653,7 +653,7 @@ def generic_deck_table(
 
     # Start building the string we are to return:
     string = keyword + "\n"
-    if comment is not None and comment:
+    if comment:
         string += "\n".join(["-- " + line for line in comment.splitlines()]) + "\n"
 
     # Empty tables are ok with Eclipse (at least sometimes)
@@ -664,7 +664,7 @@ def generic_deck_table(
     # Pandas make a pretty txt table:
     dframe = dframe.copy()
 
-    # Column names are pr. ec2ldf standard, redo to opm.common in order to use
+    # Column names are pr. res2df standard, redo to opm.common in order to use
     # sorting from that:
     if renamer is not None:
         inv_renamer = {value: key for key, value in renamer.items()}
@@ -696,11 +696,14 @@ def generic_deck_table(
     dframe = dframe.fillna(value="1*")
 
     if drop_trailing_columns:
+        columns_to_drop = []
         for col_name in reversed(relevant_columns):
-            if set(dframe[col_name].to_numpy()) == {"1*"}:
-                del dframe[col_name]
+            if (dframe[col_name] == "1*").all():
+                columns_to_drop.append(col_name)
             else:
                 break
+        if columns_to_drop:
+            dframe = dframe.drop(columns=columns_to_drop)
 
     # It is critical for opm.common, maybe also E100 to have integers printed
     # as integers, for correct parsing. Ensure these are integer where the json
@@ -708,13 +711,15 @@ def generic_deck_table(
     integer_cols = {
         item["name"]
         for item in OPMKEYWORDS[keyword]["items"]
-        if item["value_type"] == "INT"  # and item["name"] in col_headers
+        if item["value_type"] == "INT"
     }
     for int_col in integer_cols.intersection(dframe.columns):
-        defaulted_rows = dframe[int_col] == "1*"
-        integer_values = dframe.loc[~defaulted_rows, int_col].astype(int)
+        mask = dframe[int_col] != "1*"
         dframe[int_col] = dframe[int_col].astype(str)
-        dframe.loc[~defaulted_rows, int_col] = integer_values
+        if mask.any():
+            dframe.loc[mask, int_col] = (
+                dframe.loc[mask, int_col].astype(float).astype(int).astype(str)
+            )
 
     # Quote all string data. This is not always needed, but needed
     # for some colums, for example well-names containing a slash.
@@ -726,9 +731,8 @@ def generic_deck_table(
     for str_col in string_cols.intersection(dframe.columns):
         # Ensure 1* is not quoted.
         non_defaulted_rows = dframe[str_col] != "1*"
-        dframe.loc[non_defaulted_rows, str_col].str.replace("'", "")
         dframe.loc[non_defaulted_rows, str_col] = (
-            "'" + dframe.loc[non_defaulted_rows, str_col] + "'"
+            "'" + dframe.loc[non_defaulted_rows, str_col].str.replace("'", "") + "'"
         )
 
     # Now rename again to have prettier column names:
@@ -739,8 +743,7 @@ def generic_deck_table(
     tablestring = dframe.to_string(header=True, index=False)
     # Indent all lines with two spaces:
     tablestring = "\n".join(
-        ["  " + line.strip().replace("  /", " /") for line in tablestring.splitlines()]
-        # The replace() in there is needed for py36/pandas==1.1.5 only.
+        "  " + line.strip().replace("  /", " /") for line in tablestring.splitlines()
     )
     # Eclipse comment for the header line:
     tablestring = "--" + tablestring[1:]
@@ -836,7 +839,7 @@ def stack_on_colnames(
     # Drop rows stemming from the NaNs in the second tuple-element for
     # static columns:
     dframe = dframe.dropna(axis="index", subset=["DATE"])
-    del dframe["level_0"]
+    dframe = dframe.drop(columns="level_0")
     dframe.index.name = ""
     return dframe
 
@@ -912,11 +915,11 @@ def parse_lyrfile(filename: str | Path) -> list[dict[str, Any]] | None:
                     zonedict["to_layer"] = to_layer
                 else:
                     logger.error("From_layer higher than to_layer")
-                    raise ValueError()
+                    raise ValueError
             elif len(numbers) == 1:
                 zonedict["span"] = int(numbers[0])
             else:
-                raise ValueError()
+                raise ValueError
             lyrlist.append(zonedict)
         except ValueError:
             logger.error("Could not parse lyr file %s", filename)
@@ -967,14 +970,11 @@ def get_wells_matching_template(template: str, wells: list[str]) -> list[str]:
     Returns:
         List of matched wells
     """
-    if template.startswith("*") or template.startswith("?"):
+    if template.startswith(("*", "?")):
         raise ValueError(
             "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

@@ -751,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)  # type: ignore[call-overload]
+    return dframe.astype(object).replace({np.nan: None})
 
 
 def expand_wlist_in_welopen_df(
@@ -785,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)  # type: ignore[call-overload]
+    return dframe.astype(object).replace({np.nan: None})
 
 
 def applywelopen(
@@ -844,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)  # type: ignore[call-overload]
+    welopen_df = welopen_df.astype(object).replace({np.nan: None})
     if wlist_df is not None:
         welopen_df = expand_wlist_in_welopen_df(welopen_df, wlist_df)
     if complump_df is not None:

res2df/faults.py

@@ -7,6 +7,7 @@ a DataFrame
 
 import argparse
 import logging
+from itertools import product
 
 # Needed for mypy
 import opm.io
@@ -36,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:
@@ -47,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

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,

res2df/grid.py

@@ -47,7 +47,7 @@ def get_available_rst_dates(resdatafiles: ResdataFiles) -> list[datetime.date]:
     )
     return [
         resdatafiles.get_rstfile().iget_restart_sim_time(index).date()
-        for index in range(0, len(report_indices))
+        for index in range(len(report_indices))
     ]
 
 
@@ -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 = ""

res2df/gruptree.py

@@ -9,9 +9,7 @@ import warnings
 from typing import Any
 
 import numpy as np
-
-# Needed for mypy
-import opm.io
+import opm
 import pandas as pd
 import treelib
 
@@ -63,11 +61,14 @@ def df(
     date: datetime.date | None
     date = startdate if startdate is not None else None
 
+    if not isinstance(deck, (ResdataFiles, opm.opmcommon_python.Deck)):
+        raise TypeError("Input deck must be either ResdataFiles or an opm Deck.")
+
     if isinstance(deck, ResdataFiles):
         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
@@ -144,10 +145,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")
@@ -178,7 +179,6 @@ def df(
     # This happens with WELSPECS if both GRUPTREE and BRANPROP is defined
     # at the same timestep. And when a node is redirected to a new parent node
     dframe = dframe.drop_duplicates(subset=["DATE", "CHILD", "KEYWORD"], keep="last")
-    print(dframe)
     return dframe
 
 
@@ -254,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 = {

res2df/inferdims.py

@@ -38,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
@@ -112,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)

res2df/parameters.py

@@ -5,7 +5,7 @@ import json
 import logging
 import warnings
 from pathlib import Path
-from typing import Any
+from typing import Any, cast
 
 import pandas as pd
 import yaml
@@ -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:
@@ -79,11 +79,12 @@ def load_parameterstxt(filename: str | Path) -> dict[str, Any]:
                 engine="python",
                 names=["KEY", "VALUE"],
                 index_col=False,
+                dtype={"KEY": str},
             )
         except pd.errors.ParserWarning as txt_exc:
             raise pd.errors.ParserError(txt_exc) from txt_exc
 
-    return dframe.set_index("KEY")["VALUE"].to_dict()
+    return cast(dict[str, Any], dframe.set_index("KEY")["VALUE"].to_dict())
 
 
 def load_all(
@@ -147,7 +148,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

@@ -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",

res2df/pvt.py

@@ -252,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",

res2df/satfunc.py

@@ -103,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)
@@ -167,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",

res2df/summary.py

@@ -39,6 +39,7 @@ PD_FREQ_MNEMONICS: dict[str, str] = {
 See
 https://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html#dateoffset-objects
 """
+PANDAS_MAJOR_VERSION = int(pd.__version__.split(".")[0])
 
 
 def date_range(
@@ -617,7 +618,9 @@ def _fix_dframe_for_resdata(dframe: pd.DataFrame) -> pd.DataFrame:
     dframe = dframe.copy()
     if "DATE" in dframe.columns:
         # Infer datatype (Pandas cannot answer it) based on the first element:
-        if isinstance(dframe["DATE"].to_numpy()[0], str):
+        if PANDAS_MAJOR_VERSION >= 3:
+            dframe["DATE"] = pd.to_datetime(dframe["DATE"])
+        elif isinstance(dframe["DATE"].to_numpy()[0], str):
             # 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(
@@ -625,7 +628,7 @@ def _fix_dframe_for_resdata(dframe: pd.DataFrame) -> pd.DataFrame:
                 dtype="object",
                 index=dframe.index,
             )
-        if isinstance(dframe["DATE"].to_numpy()[0], dt.date):
+        elif isinstance(dframe["DATE"].to_numpy()[0], dt.date):
             dframe["DATE"] = pd.Series(
                 [
                     dt.datetime.combine(dateobj, dt.datetime.min.time())
@@ -650,9 +653,7 @@ def _fix_dframe_for_resdata(dframe: pd.DataFrame) -> pd.DataFrame:
     if "Unnamed: 0" in dframe:
         dframe = dframe.drop("Unnamed: 0", axis="columns")
 
-    block_columns = [
-        col for col in dframe.columns if (col.startswith("B") or col.startswith("LB"))
-    ]
+    block_columns = [col for col in dframe.columns if (col.startswith(("B", "LB")))]
     if block_columns:
         dframe = dframe.drop(columns=block_columns)
         logger.warning(
@@ -697,7 +698,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",
@@ -830,7 +831,7 @@ def summary_reverse_main(args: argparse.Namespace) -> 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(

res2df/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.3.10'
-__version_tuple__ = version_tuple = (1, 3, 10)
+__version__ = version = '1.3.12'
+__version_tuple__ = version_tuple = (1, 3, 12)
 
 __commit_id__ = commit_id = None

res2df/vfp/_vfp.py

@@ -7,6 +7,7 @@ output both in csv format as a pandas DataFrame or in pyarrow and pyarrow.table
 import argparse
 import logging
 import sys
+from pathlib import Path
 from typing import Any
 
 import numpy as np
@@ -400,8 +401,7 @@ def df2res(
         str_vfps += "\n"
 
     if filename:
-        with open(filename, "w", encoding="utf-8") as fout:
-            fout.write(str_vfps)
+        Path(filename).write_text(str_vfps, encoding="utf-8")
 
     return str_vfps
 

res2df/vfp/_vfpcommon.py

@@ -30,19 +30,18 @@ def _string2intlist(list_def_str: str) -> list[int]:
         list_def_str: String defining list of int
                       Format "[1,2,6:9]" to define list [1,2,6,7,8,9]
     """
-    list = []
+    int_list: list[int] = []
     list_def = list_def_str.strip().strip("[").strip("]")
     if list_def.strip():
         list_items = list_def.split(",") if "," in list_def else [list_def]
         for item in list_items:
             if ":" in item:
                 item_split = item.split(":")
-                for value in item_split:
-                    list.append(int(value))
+                int_list.extend(int(value) for value in item_split)
             else:
-                list.append(int(item))
+                int_list.append(int(item))
 
-    return list
+    return int_list
 
 
 def _deckrecord2list(
@@ -124,15 +123,12 @@ def _stack_vfptable2df(
     no_indices = len(index_names_list)
 
     # insert index values as first columns in dataframe
-    for i in range(0, no_indices):
+    for i in range(no_indices):
         df_vfptable.insert(i, index_names_list[i], index_values_list[i])
 
     #  create multi-index for columns
-    indextuples = []
-    for index_name in index_names_list:
-        indextuples.append((index_name, "DELETE"))
-    for flowvalue in flow_values_list:
-        indextuples.append(("TAB", str(flowvalue)))
+    indextuples = [(index_name, "DELETE") for index_name in index_names_list]
+    indextuples.extend(("TAB", str(flowvalue)) for flowvalue in flow_values_list)
 
     # Set the columns to a MultiIndex, to facilitate stacking
     df_vfptable.columns = pd.MultiIndex.from_tuples(indextuples)

res2df/vfp/_vfpinj.py

@@ -14,19 +14,15 @@ import numbers
 from typing import Any
 
 import numpy as np
+
+# Needed for mypy
+import opm.io
 import pandas as pd
 import pyarrow as pa
 
-try:
-    # Needed for mypy
-
-    import opm.io
-
-    # 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:
-    pass
+# 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 ..common import comment_formatter, parse_opmio_deckrecord
 from ._vfpcommon import (
@@ -276,7 +272,7 @@ def basic_data2pyarrow(
 
     # Column metadata is index in THP array
     col_metadata_list = []
-    for i in range(0, len(thp_values)):
+    for i in range(len(thp_values)):
         col_name = str(i)
         col_dtype = pa.float64()
         col_metadata = {
@@ -395,9 +391,10 @@ def pyarrow2basic_data(pa_table: pa.Table) -> dict[str, Any]:
     """
 
     # Extract index data from colum metadata
-    thp_indices = []
-    for i in range(0, pa_table.num_columns):
-        thp_indices.append(int(pa_table.schema.field(i).metadata[b"thp_idx"]))
+    thp_indices = [
+        int(pa_table.schema.field(i).metadata[b"thp_idx"])
+        for i in range(pa_table.num_columns)
+    ]
 
     # Extract table data as numpy.array
     bhp_data = np.array(pa_table.columns)
@@ -601,7 +598,7 @@ def _write_table_records(
     else:
         table = table.reshape(no_records, no_flow_values)
 
-    for row in range(0, no_records):
+    for row in range(no_records):
         thp = thp_indices[row]
         deck_str += f"{thp:2d}"
         for n, value in enumerate(table[row, :]):

res2df/vfp/_vfpprod.py

@@ -14,18 +14,15 @@ import numbers
 from typing import Any
 
 import numpy as np
+
+# Needed for mypy
+import opm.io
 import pandas as pd
 import pyarrow as pa
 
-try:
-    # Needed for mypy
-    import opm.io
-
-    # 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:
-    pass
+# 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 ..common import comment_formatter, parse_opmio_deckrecord
 from ._vfpcommon import (
@@ -382,7 +379,7 @@ def basic_data2pyarrow(
     # Column metadata is list of indices (THP,WFR,GFR,ALQ)
     col_metadata_list = []
     num_records = len(thp_values) * len(wfr_values) * len(gfr_values) * len(alq_values)
-    for i in range(0, num_records):
+    for i in range(num_records):
         thp_idx = thp_indices[i]
         wfr_idx = wfr_indices[i]
         gfr_idx = gfr_indices[i]
@@ -597,7 +594,7 @@ def pyarrow2basic_data(pa_table: pa.Table) -> dict[str, Any]:
     wfr_indices = []
     gfr_indices = []
     alq_indices = []
-    for i in range(0, pa_table.num_columns):
+    for i in range(pa_table.num_columns):
         thp_indices.append(int(pa_table.schema.field(i).metadata[b"thp_idx"]))
         wfr_indices.append(int(pa_table.schema.field(i).metadata[b"wfr_idx"]))
         gfr_indices.append(int(pa_table.schema.field(i).metadata[b"gfr_idx"]))
@@ -880,7 +877,7 @@ def _write_table_records(
     else:
         table = table.reshape(no_records, no_flow_values)
 
-    for row in range(0, no_records):
+    for row in range(no_records):
         thp = thp_indices[row]
         wfr = wfr_indices[row]
         gfr = gfr_indices[row]

res2df/wellcompletiondata.py

@@ -257,7 +257,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
         "DATAFILE",
         type=str,
         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(
         "--zonemap",

res2df/wellconnstatus.py

@@ -96,7 +96,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
         "DATAFILE",
         type=str,
         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(
         "-o",

{res2df-1.3.10.dist-info → res2df-1.3.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: res2df
-Version: 1.3.10
+Version: 1.3.12
 Summary: Convert reservoir simulator input and output to DataFrames
 Author-email: Håvard Berland <havb@equinor.com>
 License-Expression: GPL-3.0-only
@@ -16,6 +16,7 @@ Classifier: Topic :: Utilities
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Natural Language :: English
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -25,7 +26,7 @@ Requires-Dist: resfo
 Requires-Dist: networkx
 Requires-Dist: numpy
 Requires-Dist: opm>=2020.10.2
-Requires-Dist: pandas
+Requires-Dist: pandas>=2
 Requires-Dist: pyarrow
 Requires-Dist: pyyaml>=5.1
 Requires-Dist: treelib
@@ -48,10 +49,10 @@ Requires-Dist: sphinx-autoapi; extra == "docs"
 Requires-Dist: ipython; extra == "docs"
 Requires-Dist: rstcheck; extra == "docs"
 Requires-Dist: setuptools; extra == "docs"
-Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx<9; extra == "docs"
 Requires-Dist: sphinx-argparse; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
-Requires-Dist: sphinx_rtd_theme; extra == "docs"
+Requires-Dist: sphinx_rtd_theme>=3.1.0.rc1; extra == "docs"
 Provides-Extra: ert
 Requires-Dist: ert>=10.2.0b13; extra == "ert"
 Dynamic: license-file
@@ -59,7 +60,7 @@ Dynamic: license-file
 [![Publish to PyPI](https://github.com/equinor/res2df/actions/workflows/publish.yml/badge.svg)](https://github.com/equinor/res2df/actions/workflows/publish.yml)
 [![PyPI version](https://img.shields.io/pypi/v/res2df.svg)](https://pypi.org/project/res2df/)
 [![codecov](https://codecov.io/gh/equinor/res2df/graph/badge.svg?token=3sZBGGu5VG)](https://codecov.io/gh/equinor/res2df)
-[![Python 3.11-3.13](https://img.shields.io/badge/python-3.11%20|%203.12%20|%203.13-blue.svg)](https://www.python.org)
+[![Python 3.11-3.14](https://img.shields.io/badge/python-3.11%20|%203.12%20|%203.13%20|%203.14-blue.svg)](https://www.python.org)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 

{res2df-1.3.10.dist-info → res2df-1.3.12.dist-info}/RECORD

@@ -1,32 +1,32 @@
 res2df/__init__.py,sha256=IXPD2hI8TlGP7oZcCtXBBQlcnx3QrvYkglI94G731d4,1429
 res2df/__version__.py,sha256=3bzEDF3c5flgPrfdaj_gccAfCp9firn58xrcjSwgh7E,112
-res2df/common.py,sha256=MXJXit92q_UyWwcLPXnM9HPeywDpB6oJgFpVEeskc6Y,35041
-res2df/compdat.py,sha256=TlG7jwh7ZnqPcAjoYfaUX7fEUYfJHjRPuCcrKy9jBxw,36741
+res2df/common.py,sha256=ibSwz3g2IFAFwAv1ug0PaESGB9V1a6ziyakq4oAFiBg,34852
+res2df/compdat.py,sha256=VZrwlPBW88o4jhELWrFAEU2-N8XhgOVCEtbp1cTfAJ0,36626
 res2df/constants.py,sha256=0W-ZYlm3Bbe9MONrRhA0c4yLXfJlqGX5apFN64i8RU0,258
 res2df/csv2res.py,sha256=EN3FsBXONmKWVuYk3cTmW25bsmvhp9Yg1VvJ_DSoAA8,3077
 res2df/equil.py,sha256=6DrStpmeZDnkSUyZMd2Hxdlun95P2xi6nXUd6QPbSHw,17102
-res2df/faults.py,sha256=PSUWi1kruyL0iv1lq1r6OeoH79YNRsEgx3o1jI3O9Q4,2991
-res2df/fipreports.py,sha256=v893Bt8qFcVd1YUYoerTV8uu6a_PeS1VDJ7uWnqy7iI,7569
-res2df/grid.py,sha256=03k71XDanIr1Jlk6uMm-td8IurOVu5Pw4c-HuPVugCI,27350
-res2df/gruptree.py,sha256=1DiRP1VWoyCnxncg-qN9qHZ2YKGpEsT9b734jEmzOtg,16881
-res2df/inferdims.py,sha256=4AkRX-LjyWLMlg1RgDdRCSz3ykDgblOps6xfDZXBeOQ,7136
-res2df/nnc.py,sha256=DvrRTojNycEQ-IBJqulBuSLGnvRtgoXTHSFoSU6-ckc,9213
-res2df/parameters.py,sha256=zdGvmFg3qyzopXRTgb9CvyI1izCBYS9aZYPNBRzeDOg,6215
-res2df/pillars.py,sha256=KrsqmLe9gqx6HteqQIvE2kVQlZqVRkTRs6VeEH2w_vo,15985
-res2df/pvt.py,sha256=EaDrzDASIb-Ce2j9kDJwwfkgB1HHszNnKlaKZ1TgPhw,22460
+res2df/faults.py,sha256=wd--_6ilhOozsi0HID4YUTFuZi-8BcGhJP1f3MT17pY,3058
+res2df/fipreports.py,sha256=XvkjFyPuJnroRKHDNRkrSfU4rcfkKhYJFRi8FWahgLA,7599
+res2df/grid.py,sha256=myOGanVAGqigbbTgzxTCu12BMc4pL4S8hI1yJ1-2Udg,27288
+res2df/gruptree.py,sha256=LfYKF7xO2Te2eOKGPpCmtxPKbedKYf9P1bqCUvmKTm0,17013
+res2df/inferdims.py,sha256=NtjCaR0l54LiFRAg4Zq9xMJmYKyBSc3aLWa9RASgRNs,7124
+res2df/nnc.py,sha256=_O2Uxc0wkUeXzGosLPRAqFcSXrQ9qKm8qduOJt9k8m8,9177
+res2df/parameters.py,sha256=hr0sJC7GvhkW0OE4uNhhjnWXoSA1WJDKWbN5sElVLgE,6281
+res2df/pillars.py,sha256=PkPNVp_ukLr1HAudjlQwgrsnlb8yAVY0YuyJZdEad60,15983
+res2df/pvt.py,sha256=OAHYUpBoeFQlrNkYqsDK4oYqRMkxZpP6oyKXQ1pd0dw,22458
 res2df/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 res2df/res2csv.py,sha256=RBDz3vt15CnK0WCeGPIpOf7TzzXnl5Svi9GX7dqb7ys,10817
 res2df/res2csvlogger.py,sha256=n9gMmlgzPNbtZAN9dhrBDpahEK1bG2jPWQZ7CHjSN6c,2243
 res2df/resdatafiles.py,sha256=tMyqYYcXUua6fHQspQgt7nGWfW34wQvSjWAWD6LIGxI,9946
 res2df/rft.py,sha256=_Y6mEbhMgaV2W_l7po2prMsXbQeITMQv84ao0IR9ufI,27974
-res2df/satfunc.py,sha256=EAfOi6Y40xMHSlsRNWx46p8YvpftPY87leJM9BCTXZg,13574
-res2df/summary.py,sha256=2izIMKxqFQ-gHVsuHpguBM168YnynIWMGeD8x8pzZw4,31355
+res2df/satfunc.py,sha256=md_pb_T_XgAhL40VGWO_wH2JFOcljUvqpRSXvJc7dvg,13527
+res2df/summary.py,sha256=tm0lYagNgSycDMAvVSmpqTCMLzFvq5PDxUfzhjlVr0I,31481
 res2df/svg_color_keyword_names.txt,sha256=yiI2Ohv3NxxEAJC5OjVERZi7MLi2-bk7okyI5-xFDr8,1456
-res2df/trans.py,sha256=2SdPa01fauGth4ElCmA8z9HtPQsyfvVBdVEfo6VKLtc,10483
-res2df/version.py,sha256=uj00JTTkKT8xNjdKWd_8A4SussXm2MvL84uHQ0XWhD4,706
+res2df/trans.py,sha256=aTZ3tLQJjRGUUdw4gmGCXcAoSs33AJWHa7AYlCmoOak,10469
+res2df/version.py,sha256=XSypKUR4Hmw-4FC_upVEcnmOdXCwhUI2DUVSjR35UiA,706
 res2df/wcon.py,sha256=l5yvjQGleLyQY_ySjw2hq0C8gC-U3EMQRDGtjo4iroA,3152
-res2df/wellcompletiondata.py,sha256=B1uXTVdDRLWhX9ftfPHti9NfzxTgAY-AcMmKrpwQsCY,11106
-res2df/wellconnstatus.py,sha256=rexjlxJhN-ylllo36TUjCNZGqNpKDP71RDv308ZjAJo,4063
+res2df/wellcompletiondata.py,sha256=5wdipNlu0B9BDZaAfJcPT-WwskP_PtsTIZv-q3frKtM,11104
+res2df/wellconnstatus.py,sha256=fMar2MkCXh2_-XWLbOmdUUDftQM9LnxDkqFdrfSAgUw,4061
 res2df/hook_implementations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 res2df/hook_implementations/forward_model_steps.py,sha256=GLpmlv9exEKkCLsHv2AUKWnK4oIxJ4jhHuI0p41_m6U,4986
 res2df/opmkeywords/BRANPROP,sha256=MZA6L6J9olaprrUhRah_wgJoOiYXP-DknVAYOdsIC14,475
@@ -76,14 +76,14 @@ res2df/opmkeywords/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 res2df/opmkeywords/readme,sha256=xJM2Or6oiSP02xTe-aY4efPeh5UQiTieScoPHGV4rH0,285
 res2df/opmkeywords/runmetoupdate.sh,sha256=GKvjvd3H3Sf0bmeIduQ43pYcDmcBlOL_Epfm_xjDFUA,996
 res2df/vfp/__init__.py,sha256=6ksjEvMSkHK_3C_x5Fz0_eR4dq-DtTqm_YMv4WI13Fc,633
-res2df/vfp/_vfp.py,sha256=ORKmO3c6YeF3bVtG3FAUgS7ByBkCmLlTm6pyDw52Dxg,19377
-res2df/vfp/_vfpcommon.py,sha256=IRlyITyP1KQAZDvSyfLvEYXyzT2Q4PpHC2JmPMj5HvU,7181
+res2df/vfp/_vfp.py,sha256=sHN_08HJEtVzirltNnJ_wfm9JVm_iGrRdVF-BhSzkLQ,19371
+res2df/vfp/_vfpcommon.py,sha256=rGuExqqUVzKp8Fu6HjWcDk0Voy7ZqcxI6-V24wgHc3g,7141
 res2df/vfp/_vfpdefs.py,sha256=TT0bHHbbdGMS3Xm7dzpZPR7zBLPvlCuQIKvH7sr5TBA,6985
-res2df/vfp/_vfpinj.py,sha256=xojHI2hcdUFBUslMKu5K2p2etN-8sinlx-HlkINZOs4,22523
-res2df/vfp/_vfpprod.py,sha256=vohQOu63pQsinGT8wgreeUwxzfwH6S1Om90XB8gfUzs,35669
-res2df-1.3.10.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-res2df-1.3.10.dist-info/METADATA,sha256=L7B3z6Scx_D5kxHNEBNKOzHoXSWxYg6WzxSzBC0noi8,3973
-res2df-1.3.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-res2df-1.3.10.dist-info/entry_points.txt,sha256=ctl-_CwayyUVqFMUrwTT3Z3gZdnW6WCaiaLUJ4f_HnY,180
-res2df-1.3.10.dist-info/top_level.txt,sha256=U8AZBqrFHm9PMXg0toCfHJ817VfFtdKQpc8JuS5qToM,7
-res2df-1.3.10.dist-info/RECORD,,
+res2df/vfp/_vfpinj.py,sha256=SHDhPnrmuJavMfP-Y6Cshf0vBKx3yAZYuk9nZt4Xeao,22447
+res2df/vfp/_vfpprod.py,sha256=kKPGieDZKkfQlnFUyU6IwWUpmGRQkGr1cZtAt75PbM4,35606
+res2df-1.3.12.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+res2df-1.3.12.dist-info/METADATA,sha256=YeNbMxIa55d-WIKhbuKANtgMW7rgsM90pupDRz7uUn0,4051
+res2df-1.3.12.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+res2df-1.3.12.dist-info/entry_points.txt,sha256=ctl-_CwayyUVqFMUrwTT3Z3gZdnW6WCaiaLUJ4f_HnY,180
+res2df-1.3.12.dist-info/top_level.txt,sha256=U8AZBqrFHm9PMXg0toCfHJ817VfFtdKQpc8JuS5qToM,7
+res2df-1.3.12.dist-info/RECORD,,

{res2df-1.3.10.dist-info → res2df-1.3.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any