res2df 1.3.5__tar.gz → 1.3.7__tar.gz

{res2df-1.3.5 → res2df-1.3.7}/.github/workflows/codecov.yml

@@ -14,6 +14,7 @@ jobs:
     env:
       OS: ${{ matrix.os }}
       PYTHON: '3.11'
+      UV_SYSTEM_PYTHON: 1
 
     steps:
 
@@ -22,24 +23,28 @@ jobs:
         sudo apt-get update
         sudo apt-get install libegl1
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup Python
       uses: actions/setup-python@v5
       with:
         python-version: 3.11
-        cache: "pip"
+
+    - name: Install uv
+      uses: astral-sh/setup-uv@v6
+      with:
+        enable-cache: true
+        python-version: "3.11"
 
     - name: Install res2df
       run: |
-        pip install pip -U
-        pip install .[tests,ert]
+        uv pip install ".[tests, ert]"
 
     - name: Generate coverage report and upload
       run: |
         pytest tests --disable-warnings --cov=res2df --cov-report=xml
         # Uninstall packages that res2df supports not being installed:
-        pip uninstall --yes ert networkx opm
+        uv pip uninstall ert networkx opm
         # Run tests again in cov-append-mode:
         pytest tests --disable-warnings --cov=res2df --cov-report=xml --cov-append
         bash <(curl -s https://codecov.io/bash)

res2df-1.3.7/.github/workflows/publish.yml

@@ -0,0 +1,37 @@
+name: Publish to PyPI
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  pypi-publish:
+    name: Upload release to PyPI
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/res2df
+    permissions:
+      id-token: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Install build dependencies
+        run: |
+          pip install -U pip
+          pip install build
+
+      - name: Build distributions
+        run: python -m build
+
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

{res2df-1.3.5 → res2df-1.3.7}/.github/workflows/res2df.yml

@@ -7,9 +7,6 @@ on:
   pull_request:
     branches:
       - master
-  release:
-    types:
-      - published
 
   schedule:
     # Run CI every night and check that tests are working with latest dependencies
@@ -17,6 +14,7 @@ on:
 
 env:
   ERT_SHOW_BACKTRACE: 1
+  UV_SYSTEM_PYTHON: 1
 
 jobs:
   res2df:
@@ -39,7 +37,7 @@ jobs:
           sudo apt-get install libegl1
 
       - name: Checkout commit locally
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Checkout tags
         # This seems necessary for setuptools_scm to be able to infer
@@ -50,20 +48,24 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: "pip"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
+          python-version: ${{ matrix.python-version }}
 
       - name: Install res2df with dependencies
         run: |
-          pip install --upgrade pip
-          pip install ".[tests, docs]"
+          uv pip install ".[tests, docs]"
 
 
       - name: Install ert
         if: matrix.install-ert
-        run: pip install ".[ert]"
+        run: uv pip install ".[ert]"
 
       - name: List all installed packages
-        run: pip freeze
+        run: uv pip freeze
 
       - name: Run tests
         run: |
@@ -100,13 +102,3 @@ jobs:
               git commit -m "Update Github Pages"
               git push "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" gh-pages
             fi
-
-      - name: Build python package and publish to pypi
-        if: github.event_name == 'release' && matrix.python-version == '3.11'
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.res2df_pypi_token }}
-        run: |
-          python -m pip install --upgrade build twine
-          python -m build
-          twine upload dist/*

{res2df-1.3.5 → res2df-1.3.7}/.github/workflows/style.yml

@@ -11,6 +11,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
+env:
+  UV_SYSTEM_PYTHON: 1
+
 jobs:
   check-style:
     timeout-minutes: 15
@@ -20,7 +23,7 @@ jobs:
         python-version: ['3.12']
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
@@ -28,11 +31,16 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-        cache: "pip"
+
+    - name: Install uv
+      uses: astral-sh/setup-uv@v6
+      with:
+        enable-cache: true
+        python-version: ${{ matrix.python-version }}
 
     - name: Install res2df with style dependencies
       run: |
-        pip install ".[style]"
+        uv pip install ".[style]"
 
     - name: Run style check
       if: ${{ always() }}

{res2df-1.3.5 → res2df-1.3.7}/.github/workflows/typing.yml

@@ -11,6 +11,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
+env:
+  UV_SYSTEM_PYTHON: 1
+
 jobs:
   check-style:
     timeout-minutes: 15
@@ -20,7 +23,7 @@ jobs:
         python-version: ['3.12']
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
@@ -28,11 +31,16 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-        cache: "pip"
+
+    - name: Install uv
+      uses: astral-sh/setup-uv@v6
+      with:
+        enable-cache: true
+        python-version: ${{ matrix.python-version }}
 
     - name: Install res2df with types dependencies
       run: |
-        pip install ".[types]"
+        uv pip install ".[types]"
 
     - name: Run mypy
       run: |

{res2df-1.3.5 → res2df-1.3.7}/.pre-commit-config.yaml

@@ -1,19 +1,17 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v5.0.0
+  rev: v6.0.0
   hooks:
   - id:  no-commit-to-branch
     args: ['--branch', 'master']
   - id: check-yaml
   - id: debug-statements
   - id: end-of-file-fixer
-  - id: fix-encoding-pragma
-    args: [--remove]
   - id: mixed-line-ending
   - id: trailing-whitespace
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.2
+    rev: v0.12.12
     hooks:
     - id: ruff
       args: [ --fix ]

{res2df-1.3.5/src/res2df.egg-info → res2df-1.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: res2df
-Version: 1.3.5
+Version: 1.3.7
 Summary: Convert reservoir simulator input and output to DataFrames
 Author-email: Håvard Berland <havb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -728,7 +728,8 @@ Provides-Extra: ert
 Requires-Dist: ert>=10.2.0b13; extra == "ert"
 Dynamic: license-file
 
-[![Build Status](https://img.shields.io/github/workflow/status/equinor/res2df/res2df)](https://github.com/equinor/res2df/actions?query=workflow%3Ares2df)
+[![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)
 [![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)

{res2df-1.3.5 → res2df-1.3.7}/README.md

@@ -1,4 +1,5 @@
-[![Build Status](https://img.shields.io/github/workflow/status/equinor/res2df/res2df)](https://github.com/equinor/res2df/actions?query=workflow%3Ares2df)
+[![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)
 [![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)

{res2df-1.3.5 → res2df-1.3.7}/pyproject.toml

@@ -2,7 +2,6 @@
 requires = [
     "setuptools>=28",
     "setuptools_scm",
-    "wheel"
 ]
 build-backend = "setuptools.build_meta"
 

{res2df-1.3.5 → res2df-1.3.7}/src/res2df/grid.py

@@ -438,13 +438,12 @@ def init2df(
     usevectors = []
     include_porv = False
     for vec in init.headers:
-        if vec[1] == egrid.getNumActive() and any(
+        if vec[0] == "PORV" and any(fnmatch.fnmatch("PORV", key) for key in vectors):
+            include_porv = True
+        elif vec[1] == egrid.getNumActive() and any(
             fnmatch.fnmatch(vec[0], key) for key in vectors
         ):
             usevectors.append(vec[0])
-        if vec[0] == "PORV" and any(fnmatch.fnmatch("PORV", key) for key in vectors):
-            include_porv = True
-
     if usevectors:
         init_df = pd.DataFrame(
             columns=usevectors,
@@ -465,8 +464,6 @@ def init2df(
     else:
         init_df = pd.DataFrame()  # empty
 
-    logger.info("Extracted %s from INIT file", str(init_df.columns.values))
-
     # PORV is indexed by active_index, not global, needs special treatment:
     if include_porv:
         porv_numpy = init.iget_named_kw("PORV", 0).numpyView()
@@ -474,7 +471,8 @@ def init2df(
             egrid.get_global_index(active_index=ix)
             for ix in range(egrid.getNumActive())
         ]
-        init_df["PORV"] = porv_numpy[glob_idxs].reshape(-1, 1)
+        init_df["PORV"] = porv_numpy[glob_idxs]
+    logger.info("Extracted %s from INIT file", str(init_df.columns.values))
     return init_df
 
 

{res2df-1.3.5 → res2df-1.3.7}/src/res2df/nnc.py

@@ -60,7 +60,7 @@ def df(
     # Grid indices for first cell in cell pairs, into a vertical
     # vector. The indices are "global" in resdata terms, and are
     # 1-based (FORTRAN). Convert to zero-based before sending to get_ijk()
-    nnc1 = egrid_file["NNC1"][0].numpy_view().reshape(-1, 1)
+    nnc1 = egrid_file["NNC1"][0].numpy_view()
     logger.info(
         "NNC1: len: %d, min: %d, max: %d (global indices)",
         len(nnc1),
@@ -76,7 +76,8 @@ def df(
     nnc1_df[idx_cols1] += 1
 
     # Grid indices for second cell in cell pairs
-    nnc2 = egrid_file["NNC2"][0].numpy_view().reshape(-1, 1)
+    nnc2 = egrid_file["NNC2"][0].numpy_view()
+
     logger.info(
         "NNC2: len: %d, min: %d, max: %d (global indices)",
         len(nnc2),
@@ -91,7 +92,7 @@ def df(
     nnc2_df[idx_cols2] += 1
 
     # Obtain transmissibility value, corresponding to the cell pairs above.
-    tran = init_file["TRANNNC"][0].numpy_view().reshape(-1, 1)
+    tran = init_file["TRANNNC"][0].numpy_view()
     logger.info(
         "TRANNNC: len: %d, min: %f, max: %f, mean=%f",
         len(tran),

{res2df-1.3.5 → res2df-1.3.7}/src/res2df/version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.3.5'
-__version_tuple__ = version_tuple = (1, 3, 5)
+__version__ = version = '1.3.7'
+__version_tuple__ = version_tuple = (1, 3, 7)
+
+__commit_id__ = commit_id = 'g1808c4592'

{res2df-1.3.5 → res2df-1.3.7/src/res2df.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: res2df
-Version: 1.3.5
+Version: 1.3.7
 Summary: Convert reservoir simulator input and output to DataFrames
 Author-email: Håvard Berland <havb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -728,7 +728,8 @@ Provides-Extra: ert
 Requires-Dist: ert>=10.2.0b13; extra == "ert"
 Dynamic: license-file
 
-[![Build Status](https://img.shields.io/github/workflow/status/equinor/res2df/res2df)](https://github.com/equinor/res2df/actions?query=workflow%3Ares2df)
+[![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)
 [![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)

{res2df-1.3.5 → res2df-1.3.7}/src/res2df.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ README.md
 SECURITY.md
 pyproject.toml
 .github/workflows/codecov.yml
+.github/workflows/publish.yml
 .github/workflows/res2df.yml
 .github/workflows/style.yml
 .github/workflows/typing.yml

{res2df-1.3.5 → res2df-1.3.7}/tests/test_grid.py

@@ -9,8 +9,7 @@ import pandas as pd
 import pyarrow
 import pytest
 
-from res2df import common, grid, res2csv
-from res2df.resdatafiles import ResdataFiles
+from res2df import ResdataFiles, common, grid, res2csv
 
 TESTDIR = Path(__file__).absolute().parent
 REEK = str(TESTDIR / "data/reek/eclipse/model/2_R001_REEK-0.DATA")
@@ -163,6 +162,17 @@ def test_init2df():
         assert np.isnan(init_df["KRO"].unique()).all()
 
 
+def test_that_init2df_works_with_only_PORV():
+    """Test that requesting only PORV works"""
+    resdatafiles = ResdataFiles(REEK)
+    init_df = grid.init2df(resdatafiles, vectors="PORV")
+
+    assert isinstance(init_df, pd.DataFrame)
+    # pylint: disable=unsupported-membership-test  # false positive on Dataframe
+    assert not init_df.empty
+    assert "PORV" in init_df
+
+
 def test_grid_df():
     """Test that dataframe with INIT vectors and coordinates can be produced"""
     resdatafiles = ResdataFiles(EIGHTCELLS)
@@ -189,6 +199,16 @@ def test_grid_df():
     )
 
 
+def test_that_grid_df_works_with_only_PORV():
+    """Test that dataframe with INIT vector PORV works"""
+    resdatafiles = ResdataFiles(EIGHTCELLS)
+    grid_df = grid.df(resdatafiles, vectors="PORV")
+
+    assert isinstance(grid_df, pd.DataFrame)
+    assert not grid_df.empty
+    assert "PORV" in grid_df
+
+
 def test_df2res(tmp_path):
     """Test if we are able to output include files for grid data"""
     resdatafiles = ResdataFiles(REEK)