res2df 1.3.10__tar.gz → 1.3.11__tar.gz

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

@@ -21,7 +21,7 @@ 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']
         include:
           # For one of the Python versions we
           # install the extra dependency ert

{res2df-1.3.10 → res2df-1.3.11}/.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.11}/.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.11}/.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.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: res2df
-Version: 1.3.10
+Version: 1.3.11
 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
@@ -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.11}/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.11}/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",
 ]
 
@@ -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"]
 
@@ -140,6 +141,11 @@ select = [
   "RUF",  # ruff specific rules
   "UP",  # pyupgrade
   "ANN",  # flake8-annotations
+  "FURB",  # refurb
+  "PERF",  # perflint
+  "PTH",  # flake8-use-pathlib
+  "ICN",  # flake8-import-conventions
+  "ISC",  # flake8-implicit-str-concat
 ]
 preview = true
 ignore = [
@@ -161,7 +167,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.11}/src/res2df/common.py

@@ -972,9 +972,6 @@ def get_wells_matching_template(template: str, wells: list[str]) -> list[str]:
             "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.11}/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.11}/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.11}/src/res2df/grid.py

@@ -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.11}/src/res2df/gruptree.py

@@ -67,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
@@ -144,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")
@@ -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.11}/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.11}/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.11}/src/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-1.3.10 → res2df-1.3.11}/src/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-1.3.10 → res2df-1.3.11}/src/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-1.3.10 → res2df-1.3.11}/src/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-1.3.10 → res2df-1.3.11}/src/res2df/summary.py

@@ -697,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",
@@ -830,7 +830,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-1.3.10 → res2df-1.3.11}/src/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-1.3.10 → res2df-1.3.11}/src/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.11'
+__version_tuple__ = version_tuple = (1, 3, 11)
 
-__commit_id__ = commit_id = 'g7cab87127'
+__commit_id__ = commit_id = 'g6a680e0c8'

{res2df-1.3.10 → res2df-1.3.11}/src/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-1.3.10 → res2df-1.3.11}/src/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(
@@ -128,11 +127,8 @@ def _stack_vfptable2df(
         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-1.3.10 → res2df-1.3.11}/src/res2df/vfp/_vfpinj.py

@@ -395,9 +395,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(0, pa_table.num_columns)
+    ]
 
     # Extract table data as numpy.array
     bhp_data = np.array(pa_table.columns)

{res2df-1.3.10 → res2df-1.3.11}/src/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-1.3.10 → res2df-1.3.11}/src/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 → res2df-1.3.11}/src/res2df.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: res2df
-Version: 1.3.10
+Version: 1.3.11
 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
@@ -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.11}/src/res2df.egg-info/requires.txt

@@ -13,10 +13,10 @@ sphinx-autoapi
 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

{res2df-1.3.10 → res2df-1.3.11}/tests/test_equil.py

@@ -551,7 +551,7 @@ def test_main_subparser(tmp_path, mocker):
     phases = "WATER\nGAS\nOIL\n\n"
     ph_equil_inc = Path("phasesequil.inc")
     ph_equil_inc.write_text(
-        phases + Path("equil.inc", encoding="utf8").read_text(encoding="utf8"),
+        phases + Path("equil.inc").read_text(encoding="utf8"),
         encoding="utf8",
     )
 

{res2df-1.3.10 → res2df-1.3.11}/tests/test_summary_restarts.py

@@ -154,7 +154,7 @@ def run_reservoir_simulator(eclipse_version: str, datafile: str) -> None:
             print(result.stdout.decode())
         if result.stderr:
             print(result.stderr.decode())
-        raise RuntimeError(f"reservoir simulator failed in {os.getcwd()}")
+        raise RuntimeError(f"reservoir simulator failed in {Path.cwd()}")
 
 
 def eightcells_deck(

{res2df-1.3.10 → res2df-1.3.11}/tests/test_trans.py

@@ -2,7 +2,7 @@
 
 from pathlib import Path
 
-import networkx
+import networkx as nx
 import pandas as pd
 
 from res2df import ResdataFiles, res2csv, trans
@@ -79,7 +79,7 @@ def test_nx(tmp_path):
     resdatafiles = ResdataFiles(REEK)
     network = trans.make_nx_graph(resdatafiles, region="FIPNUM")
     assert network.number_of_nodes() == 6
-    networkx.write_gexf(network, tmp_path / "reek-fipnum-trans.gxf", prettyprint=True)
+    nx.write_gexf(network, tmp_path / "reek-fipnum-trans.gxf", prettyprint=True)
     assert (tmp_path / "reek-fipnum-trans.gxf").is_file()