res2df 1.3.8__tar.gz → 1.3.9__tar.gz

{res2df-1.3.8 → res2df-1.3.9}/.github/workflows/res2df.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.11', '3.12']
+        python-version: ['3.11', '3.12', '3.13']
         include:
           # For one of the Python versions we
           # install the extra dependency ert

{res2df-1.3.8 → res2df-1.3.9}/.github/workflows/style.yml

@@ -1,11 +1,11 @@
 name: Style
 
 on:
- push:
-   branches:
-     - master
-     - 'version-**'
- pull_request:
+  push:
+    branches:
+      - master
+      - 'version-**'
+  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.12']
+        python-version: ['3.13']
 
     steps:
     - uses: actions/checkout@v5

{res2df-1.3.8 → res2df-1.3.9}/.github/workflows/typing.yml

@@ -1,11 +1,15 @@
 name: Typing
 
 on:
- push:
-   branches:
-     - master
-     - 'version-**'
- pull_request:
+  push:
+    branches:
+      - master
+      - 'version-**'
+  pull_request:
+
+  schedule:
+    # Run CI every night and check that tests are working with latest dependencies
+    - cron: '0 0 * * *'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -20,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.12']
+        python-version: ['3.13']
 
     steps:
     - uses: actions/checkout@v5

{res2df-1.3.8 → res2df-1.3.9}/.pre-commit-config.yaml

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

{res2df-1.3.8/src/res2df.egg-info → res2df-1.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: res2df
-Version: 1.3.8
+Version: 1.3.9
 Summary: Convert reservoir simulator input and output to DataFrames
 Author-email: Håvard Berland <havb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -689,6 +689,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Natural Language :: English
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Requires-Python: >=3.11
@@ -733,7 +734,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.12](https://img.shields.io/badge/python-3.11%20|%203.12-blue.svg)](https://www.python.org)
+[![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)
 [![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.8 → res2df-1.3.9}/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.12](https://img.shields.io/badge/python-3.11%20|%203.12-blue.svg)](https://www.python.org)
+[![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)
 [![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.8 → res2df-1.3.9}/pyproject.toml

@@ -26,6 +26,7 @@ classifiers = [
     "Topic :: Utilities",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Natural Language :: English",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
 ]
@@ -105,7 +106,6 @@ extra_checks = true
 [[tool.mypy.overrides]]
 module = [
     "opm.*",
-    "resfo",
     "pyarrow", # should be removed for pyarrow > 21.0.0
     "resdata.*",
 ]

{res2df-1.3.8 → res2df-1.3.9}/src/res2df/grid.py

@@ -216,10 +216,10 @@ def rst2df(
         # Filter the rst vectors once more, all of them
         # might not be available at all timesteps:
         present_rstvectors = []
-        for vec in rstvectors:
+        for rst_vec in rstvectors:
             try:
-                if resdatafiles.get_rstfile().iget_named_kw(vec, rstindex):
-                    present_rstvectors.append(vec)
+                if resdatafiles.get_rstfile().iget_named_kw(rst_vec, rstindex):
+                    present_rstvectors.append(rst_vec)
             except IndexError:
                 pass
         logger.info(

{res2df-1.3.8 → res2df-1.3.9}/src/res2df/rft.py

@@ -406,8 +406,7 @@ def merge_icd_seg_conseg(
         seg_data = pd.DataFrame()
     if icd_data is None:
         icd_data = pd.DataFrame()
-
-    if logger.level <= logging.DEBUG:
+    if logger.isEnabledFor(logging.DEBUG):
         logger.debug("Writing connection data to con.csv")
         con_data[list(CON_TOPOLOGY_COLS.intersection(con_data.columns))].to_csv(
             "con.csv", index=False

{res2df-1.3.8 → res2df-1.3.9}/src/res2df/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.3.8'
-__version_tuple__ = version_tuple = (1, 3, 8)
+__version__ = version = '1.3.9'
+__version_tuple__ = version_tuple = (1, 3, 9)
 
-__commit_id__ = commit_id = 'gc0699bcb8'
+__commit_id__ = commit_id = 'g6ce40defe'

{res2df-1.3.8 → res2df-1.3.9/src/res2df.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: res2df
-Version: 1.3.8
+Version: 1.3.9
 Summary: Convert reservoir simulator input and output to DataFrames
 Author-email: Håvard Berland <havb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -689,6 +689,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Natural Language :: English
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Requires-Python: >=3.11
@@ -733,7 +734,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.12](https://img.shields.io/badge/python-3.11%20|%203.12-blue.svg)](https://www.python.org)
+[![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)
 [![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.8 → res2df-1.3.9}/tests/test_logging.py

@@ -1,4 +1,5 @@
 import itertools
+import logging
 
 import pytest
 
@@ -14,6 +15,17 @@ except ImportError:
     HAVE_OPM = False
 
 
+@pytest.fixture(autouse=True)
+def cleanup_loggers():
+    """Clean up all logger handlers after each test
+    to avoid messing up the loggers for subsequent tests.
+    """
+    yield
+    for name in list(logging.Logger.manager.loggerDict.keys()):
+        logger = logging.getLogger(name)
+        logger.handlers.clear()
+
+
 def test_default_logger_levels_and_split(capsys):
     """Verify that the intended usage of this logger have expected results"""
 

{res2df-1.3.8 → res2df-1.3.9}/tests/test_vfp.py

@@ -1274,54 +1274,51 @@ def test_pyarrow2basic_data_vfpinjs_no(test_input, expected):
         pd.testing.assert_frame_equal(df_vfp, expected[n])
 
 
-@pytest.fixture(scope="class", params=vfp._vfpprod.BASIC_DATA_KEYS)
+@pytest.fixture(params=vfp._vfpprod.BASIC_DATA_KEYS)
 def vfpprod_key(request):
     yield request.param
 
 
-class Test_Exceptions_vfpprod_keys:
-    @pytest.mark.parametrize("test_input, dummy", VFPPROD_CASES)
-    def test_basic_data_key_exceptions_vfpprods(self, vfpprod_key, test_input, dummy):
-        """Test exceptions for basic data format (not containing all
-        required keywords) for VFPPROD"
-        """
-        deck = ResdataFiles.str2deck(test_input)
-        basic_data_vfpprods = vfp.basic_data(deck, "VFPPROD")
+@pytest.mark.parametrize("test_input, dummy", VFPPROD_CASES)
+def test_basic_data_key_exceptions_vfpprods(vfpprod_key, test_input, dummy):
+    """Test exceptions for basic data format (not containing all
+    required keywords) for VFPPROD"
+    """
+    deck = ResdataFiles.str2deck(test_input)
+    basic_data_vfpprods = vfp.basic_data(deck, "VFPPROD")
 
-        # Check if exception is raises if one key is missing
-        basic_data_vfpprod_no_key = copy.deepcopy(basic_data_vfpprods[0])
-        del basic_data_vfpprod_no_key[vfpprod_key]
-        with pytest.raises(
-            KeyError, match=f"{vfpprod_key} key is not in basic data dictionary VFPPROD"
-        ):
-            vfp._vfpprod._check_basic_data(basic_data_vfpprod_no_key)
+    # Check if exception is raises if one key is missing
+    basic_data_vfpprod_no_key = copy.deepcopy(basic_data_vfpprods[0])
+    del basic_data_vfpprod_no_key[vfpprod_key]
+    with pytest.raises(
+        KeyError, match=f"{vfpprod_key} key is not in basic data dictionary VFPPROD"
+    ):
+        vfp._vfpprod._check_basic_data(basic_data_vfpprod_no_key)
 
 
-@pytest.fixture(scope="class", params=VFPPROD_ARRAY_NAMES)
+@pytest.fixture(params=VFPPROD_ARRAY_NAMES)
 def vfpprod_array_name(request):
     print("\n SETUP", request.param)
     yield request.param
-    # print("\n UNDO", request.param)
 
 
-class Test_Exceptions_vfpprod_dims:
-    @pytest.mark.parametrize("test_input, dummy", [VFPPROD_CASES[0]])
-    def test_basic_data_array_dim_exceptions_vfpprods(
-        self, vfpprod_array_name, test_input, dummy
-    ):
-        """Test exceptions for basic data format
-        (inconsistency in array dimensions) for VFPPROD"
-        """
-        deck = ResdataFiles.str2deck(test_input)
-        basic_data_vfpprods = vfp.basic_data(deck, "VFPPROD")
+@pytest.mark.parametrize("test_input, dummy", [VFPPROD_CASES[0]])
+def test_basic_data_array_dim_exceptions_vfpprods(
+    vfpprod_array_name, test_input, dummy
+):
+    """Test exceptions for basic data format
+    (inconsistency in array dimensions) for VFPPROD"
+    """
+    deck = ResdataFiles.str2deck(test_input)
+    basic_data_vfpprods = vfp.basic_data(deck, "VFPPROD")
 
-        # Check if exception is raises if array dimension is wrong
-        basic_data_vfpprod_wrong_dim = copy.deepcopy(basic_data_vfpprods[0])
-        basic_data_vfpprod_wrong_dim[vfpprod_array_name] = basic_data_vfpprod_wrong_dim[
-            vfpprod_array_name
-        ][1:]
-        with pytest.raises(ValueError):
-            vfp._vfpprod._check_basic_data(basic_data_vfpprod_wrong_dim)
+    # Check if exception is raises if array dimension is wrong
+    basic_data_vfpprod_wrong_dim = copy.deepcopy(basic_data_vfpprods[0])
+    basic_data_vfpprod_wrong_dim[vfpprod_array_name] = basic_data_vfpprod_wrong_dim[
+        vfpprod_array_name
+    ][1:]
+    with pytest.raises(ValueError):
+        vfp._vfpprod._check_basic_data(basic_data_vfpprod_wrong_dim)
 
 
 @pytest.mark.parametrize("test_input, expected", VFPPROD_CASES)
@@ -1339,53 +1336,47 @@ def test_basic_data_dims_vfpprods(test_input, expected):
         vfp._vfpprod._check_basic_data(basic_data_vfpprod)
 
 
-@pytest.fixture(scope="class", params=vfp._vfpinj.BASIC_DATA_KEYS)
+@pytest.fixture(params=vfp._vfpinj.BASIC_DATA_KEYS)
 def vfpinj_key(request):
     print("\n SETUP", request.param)
     yield request.param
-    # print("\n UNDO", request.param)
 
 
-class Test_Exceptions_vfpinj_keys:
-    @pytest.mark.parametrize("test_input, dummy", VFPINJ_CASES)
-    def test_basic_data_key_exceptions_vfpinjs(self, vfpinj_key, test_input, dummy):
-        """Test exceptions for basic data format (not containing all
-        required keywords) for VFPINJ"
-        """
-        deck = ResdataFiles.str2deck(test_input)
-        basic_data_vfpinjs = vfp.basic_data(deck, "VFPINJ")
+@pytest.mark.parametrize("test_input, dummy", VFPINJ_CASES)
+def test_basic_data_key_exceptions_vfpinjs(vfpinj_key, test_input, dummy):
+    """Test exceptions for basic data format (not containing all
+    required keywords) for VFPINJ"
+    """
+    deck = ResdataFiles.str2deck(test_input)
+    basic_data_vfpinjs = vfp.basic_data(deck, "VFPINJ")
 
-        # Check if exception is raises if one key is missing
-        basic_data_vfpinj_no_key = copy.deepcopy(basic_data_vfpinjs[0])
-        del basic_data_vfpinj_no_key[vfpinj_key]
-        with pytest.raises(
-            KeyError, match=f"{vfpinj_key} key is not in basic data dictionary VFPINJ"
-        ):
-            vfp._vfpinj._check_basic_data(basic_data_vfpinj_no_key)
+    # Check if exception is raises if one key is missing
+    basic_data_vfpinj_no_key = copy.deepcopy(basic_data_vfpinjs[0])
+    del basic_data_vfpinj_no_key[vfpinj_key]
+    with pytest.raises(
+        KeyError, match=f"{vfpinj_key} key is not in basic data dictionary VFPINJ"
+    ):
+        vfp._vfpinj._check_basic_data(basic_data_vfpinj_no_key)
 
 
-@pytest.fixture(scope="class", params=VFPINJ_ARRAY_NAMES)
+@pytest.fixture(params=VFPINJ_ARRAY_NAMES)
 def vfpinj_array_name(request):
     print("\n SETUP", request.param)
     yield request.param
-    # print("\n UNDO", request.param)
 
 
-class Test_Exceptions_vfpinj_dims:
-    @pytest.mark.parametrize("test_input, dummy", [VFPINJ_CASES[0]])
-    def test_basic_data_array_dim_exceptions_vfpinjs(
-        self, vfpinj_array_name, test_input, dummy
-    ):
-        """Test exceptions for basic data format
-        (inconsistency in array dimensions) for VFPINJ"
-        """
-        deck = ResdataFiles.str2deck(test_input)
-        basic_data_vfpinjs = vfp.basic_data(deck, "VFPINJ")
-
-        # Check if exception is raises if array dimension if wrong
-        basic_data_vfpinj_wrong_dim = copy.deepcopy(basic_data_vfpinjs[0])
-        basic_data_vfpinj_wrong_dim[vfpinj_array_name] = basic_data_vfpinj_wrong_dim[
-            vfpinj_array_name
-        ][1:]
-        with pytest.raises(ValueError):
-            vfp._vfpinj._check_basic_data(basic_data_vfpinj_wrong_dim)
+@pytest.mark.parametrize("test_input, dummy", [VFPINJ_CASES[0]])
+def test_basic_data_array_dim_exceptions_vfpinjs(vfpinj_array_name, test_input, dummy):
+    """Test exceptions for basic data format
+    (inconsistency in array dimensions) for VFPINJ"
+    """
+    deck = ResdataFiles.str2deck(test_input)
+    basic_data_vfpinjs = vfp.basic_data(deck, "VFPINJ")
+
+    # Check if exception is raises if array dimension if wrong
+    basic_data_vfpinj_wrong_dim = copy.deepcopy(basic_data_vfpinjs[0])
+    basic_data_vfpinj_wrong_dim[vfpinj_array_name] = basic_data_vfpinj_wrong_dim[
+        vfpinj_array_name
+    ][1:]
+    with pytest.raises(ValueError):
+        vfp._vfpinj._check_basic_data(basic_data_vfpinj_wrong_dim)