res2df 1.3.11__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,7 +970,7 @@ 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}"

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/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))
     ]
 
 

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,6 +61,9 @@ 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()
 
@@ -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
 
 

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
@@ -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(

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(

res2df/version.py

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

res2df/vfp/_vfpcommon.py

@@ -123,7 +123,7 @@ 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

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 = {
@@ -397,7 +393,7 @@ def pyarrow2basic_data(pa_table: pa.Table) -> dict[str, Any]:
     # Extract index data from colum metadata
     thp_indices = [
         int(pa_table.schema.field(i).metadata[b"thp_idx"])
-        for i in range(0, pa_table.num_columns)
+        for i in range(pa_table.num_columns)
     ]
 
     # Extract table data as numpy.array
@@ -602,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-1.3.11.dist-info → res2df-1.3.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: res2df
-Version: 1.3.11
+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
@@ -26,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

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

@@ -1,17 +1,17 @@
 res2df/__init__.py,sha256=IXPD2hI8TlGP7oZcCtXBBQlcnx3QrvYkglI94G731d4,1429
 res2df/__version__.py,sha256=3bzEDF3c5flgPrfdaj_gccAfCp9firn58xrcjSwgh7E,112
-res2df/common.py,sha256=K6sTXPusioWKb50etYLw_PiCANPMmwedeq4r2l_5RLQ,34910
-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=wd--_6ilhOozsi0HID4YUTFuZi-8BcGhJP1f3MT17pY,3058
 res2df/fipreports.py,sha256=XvkjFyPuJnroRKHDNRkrSfU4rcfkKhYJFRi8FWahgLA,7599
-res2df/grid.py,sha256=dW1fcrur4wz6ZO8VtP6GvKHmz3qdeKXh8n8kKocJPUQ,27291
-res2df/gruptree.py,sha256=ffWLzN4V67qcgjV0DUsQgVGWINoM8yPBlUSI1sK15Ys,16898
+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=X2dtb_RPpC3lR3RV1sjCqQjvn13eSWQtZJOT-KvLJQA,6217
+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
@@ -20,10 +20,10 @@ res2df/res2csvlogger.py,sha256=n9gMmlgzPNbtZAN9dhrBDpahEK1bG2jPWQZ7CHjSN6c,2243
 res2df/resdatafiles.py,sha256=tMyqYYcXUua6fHQspQgt7nGWfW34wQvSjWAWD6LIGxI,9946
 res2df/rft.py,sha256=_Y6mEbhMgaV2W_l7po2prMsXbQeITMQv84ao0IR9ufI,27974
 res2df/satfunc.py,sha256=md_pb_T_XgAhL40VGWO_wH2JFOcljUvqpRSXvJc7dvg,13527
-res2df/summary.py,sha256=Q3natArNIvMoWFhYRvsV4t8Rhj4af-cOmh-oWQXfuK4,31352
+res2df/summary.py,sha256=tm0lYagNgSycDMAvVSmpqTCMLzFvq5PDxUfzhjlVr0I,31481
 res2df/svg_color_keyword_names.txt,sha256=yiI2Ohv3NxxEAJC5OjVERZi7MLi2-bk7okyI5-xFDr8,1456
 res2df/trans.py,sha256=aTZ3tLQJjRGUUdw4gmGCXcAoSs33AJWHa7AYlCmoOak,10469
-res2df/version.py,sha256=RIYRhQ2JFIUmHdqcIYBvks_0HOhsZi2Vy6dWdcTCKVw,706
+res2df/version.py,sha256=XSypKUR4Hmw-4FC_upVEcnmOdXCwhUI2DUVSjR35UiA,706
 res2df/wcon.py,sha256=l5yvjQGleLyQY_ySjw2hq0C8gC-U3EMQRDGtjo4iroA,3152
 res2df/wellcompletiondata.py,sha256=5wdipNlu0B9BDZaAfJcPT-WwskP_PtsTIZv-q3frKtM,11104
 res2df/wellconnstatus.py,sha256=fMar2MkCXh2_-XWLbOmdUUDftQM9LnxDkqFdrfSAgUw,4061
@@ -77,13 +77,13 @@ 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=sHN_08HJEtVzirltNnJ_wfm9JVm_iGrRdVF-BhSzkLQ,19371
-res2df/vfp/_vfpcommon.py,sha256=Np49jE5SIecw-4Gb5ZsGOc45Ln66gseZEDkX8EL2axk,7144
+res2df/vfp/_vfpcommon.py,sha256=rGuExqqUVzKp8Fu6HjWcDk0Voy7ZqcxI6-V24wgHc3g,7141
 res2df/vfp/_vfpdefs.py,sha256=TT0bHHbbdGMS3Xm7dzpZPR7zBLPvlCuQIKvH7sr5TBA,6985
-res2df/vfp/_vfpinj.py,sha256=WYaJRSF2LBnW6dqm4mdhZWGizlKBiUe-xcNBGjgqZ2s,22511
-res2df/vfp/_vfpprod.py,sha256=vohQOu63pQsinGT8wgreeUwxzfwH6S1Om90XB8gfUzs,35669
-res2df-1.3.11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-res2df-1.3.11.dist-info/METADATA,sha256=k0mpu_hkpNscaCYFH1s5EvG-z0kkohSvpnwsgZjEqWs,4048
-res2df-1.3.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-res2df-1.3.11.dist-info/entry_points.txt,sha256=ctl-_CwayyUVqFMUrwTT3Z3gZdnW6WCaiaLUJ4f_HnY,180
-res2df-1.3.11.dist-info/top_level.txt,sha256=U8AZBqrFHm9PMXg0toCfHJ817VfFtdKQpc8JuS5qToM,7
-res2df-1.3.11.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.11.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