res2df 1.3.6__tar.gz → 1.3.8__tar.gz

{res2df-1.3.6 → res2df-1.3.8}/.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
+      uses: actions/setup-python@v6
       with:
         python-version: 3.11
-        cache: "pip"
+
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
+      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 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.6 → res2df-1.3.8}/.github/workflows/publish.yml

@@ -16,12 +16,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - name: Set up Python 3.11
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
 

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

@@ -14,6 +14,7 @@ on:
 
 env:
   ERT_SHOW_BACKTRACE: 1
+  UV_SYSTEM_PYTHON: 1
 
 jobs:
   res2df:
@@ -36,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
@@ -44,23 +45,27 @@ jobs:
         run: git fetch --unshallow --tags
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
-          cache: "pip"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        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: |

{res2df-1.3.6 → res2df-1.3.8}/.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,19 +23,24 @@ jobs:
         python-version: ['3.12']
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
       with:
+        enable-cache: true
         python-version: ${{ matrix.python-version }}
-        cache: "pip"
 
     - name: Install res2df with style dependencies
       run: |
-        pip install ".[style]"
+        uv pip install ".[style]"
 
     - name: Run style check
       if: ${{ always() }}

{res2df-1.3.6 → res2df-1.3.8}/.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,19 +23,24 @@ jobs:
         python-version: ['3.12']
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
       with:
+        enable-cache: true
         python-version: ${{ matrix.python-version }}
-        cache: "pip"
 
     - name: Install res2df with types dependencies
       run: |
-        pip install ".[types]"
+        uv pip install ".[types]"
 
     - name: Run mypy
       run: |

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

@@ -1,20 +1,18 @@
 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.14.0
     hooks:
-    - id: ruff
+    - id: ruff-check
       args: [ --fix ]
     - id: ruff-format

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: res2df
-Version: 1.3.6
+Version: 1.3.8
 Summary: Convert reservoir simulator input and output to DataFrames
 Author-email: Håvard Berland <havb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -696,6 +696,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: resdata>=5.0.0-b0
 Requires-Dist: resfo
+Requires-Dist: networkx
 Requires-Dist: numpy
 Requires-Dist: opm>=2020.10.2
 Requires-Dist: pandas
@@ -703,7 +704,6 @@ Requires-Dist: pyarrow
 Requires-Dist: pyyaml>=5.1
 Requires-Dist: treelib
 Provides-Extra: tests
-Requires-Dist: networkx; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
 Requires-Dist: pytest-mock; extra == "tests"
@@ -715,6 +715,8 @@ Requires-Dist: mypy; extra == "types"
 Requires-Dist: types-PyYAML; extra == "types"
 Requires-Dist: types-python-dateutil; extra == "types"
 Requires-Dist: types-setuptools; extra == "types"
+Requires-Dist: types-networkx; extra == "types"
+Requires-Dist: pandas-stubs; extra == "types"
 Provides-Extra: docs
 Requires-Dist: autoapi; extra == "docs"
 Requires-Dist: ipython; extra == "docs"

{res2df-1.3.6 → res2df-1.3.8}/docs/conf.py

@@ -24,7 +24,7 @@ author = "Håvard Berland"
 copyright = f"Equinor 2019-{datetime.datetime.now().year}"
 
 # The short X.Y version
-import res2df  # noqa
+import res2df  # noqa: F401, E402
 
 release = metadata.version("res2df")
 version = release

{res2df-1.3.6 → res2df-1.3.8}/pyproject.toml

@@ -2,7 +2,6 @@
 requires = [
     "setuptools>=28",
     "setuptools_scm",
-    "wheel"
 ]
 build-backend = "setuptools.build_meta"
 
@@ -36,6 +35,7 @@ dynamic = ["version"]
 dependencies= [
 "resdata>=5.0.0-b0",
 "resfo",
+"networkx",
 "numpy",
 "opm>=2020.10.2",
 "pandas",
@@ -46,7 +46,6 @@ dependencies= [
 
 [project.optional-dependencies]
 tests = [
-    "networkx",
     "pytest",
     "pytest-cov",
     "pytest-mock",
@@ -57,7 +56,9 @@ types = [
     "mypy",
     "types-PyYAML",
     "types-python-dateutil",
-    "types-setuptools"
+    "types-setuptools",
+    "types-networkx",
+    "pandas-stubs",
 ]
 docs = [
     "autoapi",
@@ -98,12 +99,18 @@ res2df = "src/res2df"
 res2df = ["opmkeywords/*", "py.typed", "svg_color_keyword_names.txt"]
 
 [tool.mypy]
+strict_equality = true
+extra_checks = true
+
+[[tool.mypy.overrides]]
+module = [
+    "opm.*",
+    "resfo",
+    "pyarrow", # should be removed for pyarrow > 21.0.0
+    "resdata.*",
+]
 ignore_missing_imports = true
 
-[tool.pylint]
-# Module docstrings are not required
-disable = "missing-module-docstring"
-
 [tool.pytest.ini_options]
 markers = [
     "integration: marks a test as an integration test",
@@ -128,6 +135,9 @@ select = [
   "PL",  # pylint
   "NPY",  # numpy specific rules
   "C4",  # flake8-comprehensions
+  "PD",  # pandas-vet
+  "RUF",  # ruff specific rules
+  "UP",  # pyupgrade
 ]
 preview = true
 ignore = [
@@ -144,10 +154,12 @@ ignore = [
   "PLR0904",  # too-many-public-methods
   "PLR1702",  # too-many-nested-blocks
   "PLW3201",  # bad-dunder-method-name
+  "PD013",  # pandas-use-of-dot-stack
 ]
 
 [tool.ruff.lint.extend-per-file-ignores]
 "src/res2df/__init__.py" = ["PLC0414"]
+"tests/*" = ["RUF005"]
 
 [tool.ruff.lint.pylint]
 max-args = 20

{res2df-1.3.6 → res2df-1.3.8}/src/res2df/__init__.py

@@ -1,11 +1,10 @@
 import importlib
-from typing import List
 
 from .__version__ import __version__ as __version__
 from .res2csvlogger import getLogger_res2csv as getLogger_res2csv
 from .resdatafiles import ResdataFiles as ResdataFiles
 
-SUBMODULES: List[str] = [
+SUBMODULES: list[str] = [
     "compdat",
     "equil",
     "faults",
@@ -26,5 +25,5 @@ SUBMODULES: List[str] = [
 ]
 
 
-for submodule in SUBMODULES + ["res2csv", "csv2res"]:
+for submodule in [*SUBMODULES, "res2csv", "csv2res"]:
     importlib.import_module("res2df." + submodule)