PyPI - res2df - Versions diffs - 1.3.7__tar.gz → 1.3.9__tar.gz - Mend

res2df 1.3.7tar.gz → 1.3.9tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (251) hide show

{res2df-1.3.7 → res2df-1.3.9}/.github/workflows/codecov.yml RENAMED Viewed

@@ -26,12 +26,12 @@ jobs:
     - uses: actions/checkout@v5
     - name: Setup Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.11
     - name: Install uv
-      uses: astral-sh/setup-uv@v6
+      uses: astral-sh/setup-uv@v7
       with:
         enable-cache: true
         python-version: "3.11"
@@ -44,7 +44,7 @@ jobs:
       run: |
         pytest tests --disable-warnings --cov=res2df --cov-report=xml
         # Uninstall packages that res2df supports not being installed:
-        uv pip uninstall 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.7 → res2df-1.3.9}/.github/workflows/publish.yml RENAMED Viewed

@@ -21,7 +21,7 @@ jobs:
           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.7 → res2df-1.3.9}/.github/workflows/res2df.yml RENAMED Viewed

@@ -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
@@ -45,12 +45,12 @@ 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 }}
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           enable-cache: true
           python-version: ${{ matrix.python-version }}

{res2df-1.3.7 → res2df-1.3.9}/.github/workflows/style.yml RENAMED Viewed

@@ -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
@@ -28,12 +28,12 @@ jobs:
         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@v6
+      uses: astral-sh/setup-uv@v7
       with:
         enable-cache: true
         python-version: ${{ matrix.python-version }}

{res2df-1.3.7 → res2df-1.3.9}/.github/workflows/typing.yml RENAMED Viewed

@@ -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
@@ -28,12 +32,12 @@ jobs:
         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@v6
+      uses: astral-sh/setup-uv@v7
       with:
         enable-cache: true
         python-version: ${{ matrix.python-version }}

{res2df-1.3.7 → res2df-1.3.9}/.pre-commit-config.yaml RENAMED Viewed

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

{res2df-1.3.7/src/res2df.egg-info → res2df-1.3.9}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: res2df
-Version: 1.3.7
+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
@@ -696,6 +697,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 +705,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 +716,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"
@@ -731,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.7 → res2df-1.3.9}/README.md RENAMED Viewed

@@ -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.7 → res2df-1.3.9}/docs/conf.py RENAMED Viewed

@@ -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.7 → res2df-1.3.9}/pyproject.toml RENAMED Viewed

@@ -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)",
 ]
@@ -35,6 +36,7 @@ dynamic = ["version"]
 dependencies= [
 "resdata>=5.0.0-b0",
 "resfo",
+"networkx",
 "numpy",
 "opm>=2020.10.2",
 "pandas",
@@ -45,7 +47,6 @@ dependencies= [
 [project.optional-dependencies]
 tests = [
-    "networkx",
     "pytest",
     "pytest-cov",
     "pytest-mock",
@@ -56,7 +57,9 @@ types = [
     "mypy",
     "types-PyYAML",
     "types-python-dateutil",
-    "types-setuptools"
+    "types-setuptools",
+    "types-networkx",
+    "pandas-stubs",
 ]
 docs = [
     "autoapi",
@@ -97,12 +100,17 @@ 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.*",
+    "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",
@@ -127,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 = [
@@ -143,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.7 → res2df-1.3.9}/src/res2df/__init__.py RENAMED Viewed

@@ -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)

res2df 1.3.7__tar.gz → 1.3.9__tar.gz

res2df 1.3.7tar.gz → 1.3.9tar.gz