res2df 1.3.10__tar.gz → 1.3.12__tar.gz

{res2df-1.3.10 → res2df-1.3.12}/.github/workflows/res2df.yml

@@ -10,7 +10,7 @@ on:
 
   schedule:
     # Run CI every night and check that tests are working with latest dependencies
-    - cron: '0 0 * * *'
+    - cron: "0 0 * * *"
 
 env:
   ERT_SHOW_BACKTRACE: 1
@@ -21,16 +21,23 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.11', '3.12', '3.13']
+        python-version: ["3.11", "3.12", "3.13", "3.14"]
+        pandas-version: [""]
         include:
           # For one of the Python versions we
           # install the extra dependency ert
           # (in order to not double the job matrix)
-          - python-version: '3.11'
+          - python-version: "3.11"
             install-ert: true
+          - python-version: "3.13"
+            pandas-version: ">=2,<3"
+          - python-version: "3.13"
+            pandas-version: ">=3.0.0"
+        exclude:
+          - python-version: "3.13"
+            pandas-version: ""
 
     steps:
-
       - name: Install Ubuntu dependencies
         run: |
           sudo apt-get update
@@ -59,11 +66,14 @@ jobs:
         run: |
           uv pip install ".[tests, docs]"
 
-
       - name: Install ert
         if: matrix.install-ert
         run: uv pip install ".[ert]"
 
+      - name: Pin pandas version
+        if: matrix.pandas-version
+        run: uv pip install "pandas${{ matrix.pandas-version }}"
+
       - name: List all installed packages
         run: uv pip freeze
 
@@ -84,22 +94,22 @@ jobs:
       - name: Update GitHub pages
         if: github.repository_owner == 'equinor' && github.ref == 'refs/heads/master' && matrix.python-version == '3.11'
         run: |
-            cp -R ./build/sphinx/html ../html
+          cp -R ./build/sphinx/html ../html
 
-            git config --local user.email "res2df-github-action"
-            git config --local user.name "res2df-github-action"
-            git fetch origin gh-pages
-            git checkout --track origin/gh-pages
-            git clean -f -f -d -x
-            git rm -r *
+          git config --local user.email "res2df-github-action"
+          git config --local user.name "res2df-github-action"
+          git fetch origin gh-pages
+          git checkout --track origin/gh-pages
+          git clean -f -f -d -x
+          git rm -r *
 
-            cp -R ../html/* .
+          cp -R ../html/* .
 
-            git add .
+          git add .
 
-            if git diff-index --quiet HEAD; then
-              echo "No changes in documentation. Skip documentation deploy."
-            else
-              git commit -m "Update Github Pages"
-              git push "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" gh-pages
-            fi
+          if git diff-index --quiet HEAD; then
+            echo "No changes in documentation. Skip documentation deploy."
+          else
+            git commit -m "Update Github Pages"
+            git push "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" gh-pages
+          fi

{res2df-1.3.10 → res2df-1.3.12}/.github/workflows/style.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.13']
+        python-version: ['3.14']
 
     steps:
     - uses: actions/checkout@v6

{res2df-1.3.10 → res2df-1.3.12}/.github/workflows/typing.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.13']
+        python-version: ['3.14']
 
     steps:
     - uses: actions/checkout@v6

{res2df-1.3.10 → res2df-1.3.12}/.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
   - id: trailing-whitespace
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.8
+    rev: v0.14.10
     hooks:
     - id: ruff-check
       args: [ --fix ]

{res2df-1.3.10 → res2df-1.3.12}/PKG-INFO

@@ -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 → res2df-1.3.12}/README.md

@@ -1,7 +1,7 @@
 [![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 → res2df-1.3.12}/pyproject.toml

@@ -28,6 +28,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Natural Language :: English",
 ]
 
@@ -39,7 +40,7 @@ dependencies= [
 "networkx",
 "numpy",
 "opm>=2020.10.2",
-"pandas",
+"pandas >= 2",
 "pyarrow",
 "pyyaml>=5.1",
 "treelib",
@@ -66,10 +67,10 @@ docs = [
     "ipython",
     "rstcheck",
     "setuptools",
-    "sphinx",
+    "sphinx < 9",
     "sphinx-argparse",
     "sphinx-autodoc-typehints",
-    "sphinx_rtd_theme"
+    "sphinx_rtd_theme >= 3.1.0.rc1",
 ]
 ert = ["ert>=10.2.0b13"]
 
@@ -127,19 +128,44 @@ line-length = 88
 
 [tool.ruff.lint]
 select = [
-  "E",  # pycodestyle
-  "W",  # pycodestyle
-  "I",  # isort
+  "AIR",  # airflow
+  "ANN",  # flake8-annotations
+  "ASYNC",  # flake8-async
   "B",  # flake-8-bugbear
-  "SIM",  # flake-8-simplify
+  "C4",  # flake8-comprehensions
+  "DJ",  # django
+  "E",  # pycodestyle
   "F",  # pyflakes
-  "PL",  # pylint
+  "FA",  # future-annotations
+  "FAST",  # fastapi
+  "FIX", # fixme
+  "FLY", # flynt
+  "FURB",  # refurb
+  "I",  # isort
+  "ICN",  # flake8-import-conventions
+  "INT", # gettext
+  "ISC",  # flake8-implicit-str-concat
   "NPY",  # numpy specific rules
-  "C4",  # flake8-comprehensions
   "PD",  # pandas-vet
+  "PERF",  # perflint
+  "PGH",  # pygrep-hooks
+  "PIE",  # flake8-pie
+  "PL",  # pylint
+  "PLC",  # pylint convention
+  "PLE",  # pylint error
+  "PLR",  # pylint refactor
+  "PLW",  # pylint warning
+  "PTH",  # flake8-use-pathlib
+  "PYI",  # flake8-pyi
+  "Q",  # quotes
+  "RSE",  # raise
   "RUF",  # ruff specific rules
+  "SIM",  # flake-8-simplify
+  "SLOT", # flake8-slots
+  "TD",  # todos
   "UP",  # pyupgrade
-  "ANN",  # flake8-annotations
+  "W",  # pycodestyle
+  "YTT",  # year 2020
 ]
 preview = true
 ignore = [
@@ -161,7 +187,7 @@ ignore = [
 
 [tool.ruff.lint.extend-per-file-ignores]
 "src/res2df/__init__.py" = ["PLC0414"]
-"tests/*" = ["RUF005", "ANN"]
+"tests/*" = ["RUF005", "ANN", "FURB113", "PERF"]
 "docs/*" = ["ANN"]
 
 [tool.ruff.lint.pylint]

{res2df-1.3.10 → res2df-1.3.12}/src/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-1.3.10 → res2df-1.3.12}/src/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-1.3.10 → res2df-1.3.12}/src/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-1.3.10 → res2df-1.3.12}/src/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-1.3.10 → res2df-1.3.12}/src/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-1.3.10 → res2df-1.3.12}/src/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-1.3.10 → res2df-1.3.12}/src/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-1.3.10 → res2df-1.3.12}/src/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-1.3.10 → res2df-1.3.12}/src/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")