subscript 1.14.2__tar.gz → 1.14.4__tar.gz

{subscript-1.14.2 → subscript-1.14.4}/.github/workflows/codecov.yml

@@ -1,10 +1,13 @@
 name: codecoverage
 on:
   pull_request:
-    branches: [main]
   push:
     branches: [main]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   coverage:
     runs-on: ${{ matrix.os }}
@@ -26,33 +29,31 @@ jobs:
     - uses: actions/checkout@v5
 
     - name: Setup Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.12
 
     - name: Install uv
-      uses: astral-sh/setup-uv@v6
+      uses: astral-sh/setup-uv@v7
       with:
         enable-cache: true
         python-version: "3.12"
 
-    - name: Install OPM-flow and ResInsight (for testing)
+    - name: Install OPM-flow (for testing)
       run: |
         sudo apt-get install software-properties-common
         sudo apt-add-repository ppa:opm/ppa
         sudo apt-get update
         sudo apt-get install mpi-default-bin
         sudo apt-get install libopm-simulators-bin
-        sudo apt-get install resinsight
 
     - name: Install subscript and test dependencies
       run: |
         uv pip install ".[tests]"
 
-    - name: Log OPM-Flow and ResInsight version
+    - name: Log OPM-Flow version
       run: |
         flow --version
-        ResInsight --console --version
 
     - name: Generate coverage report
       run: |

subscript-1.14.4/.github/workflows/linting.yml

@@ -0,0 +1,58 @@
+name: lint
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  release:
+    types:
+      - published
+  schedule:
+    # Run nightly to check that tests are working with latest dependencies
+    - cron: "0 0 * * *"
+
+env:
+  UV_SYSTEM_PYTHON: 1
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.13"]
+
+    steps:
+      - name: Checkout commit locally
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install subscript with dependencies
+        run: |
+          uv pip install ".[tests, docs]"
+
+      - name: Format and lint with ruff
+        run: |
+          ruff format . --check
+          ruff check .
+
+      - name: Check typing with mypy
+        run: mypy src/subscript

{subscript-1.14.2 → subscript-1.14.4}/.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.12
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.12
 

{subscript-1.14.2 → subscript-1.14.4}/.github/workflows/subscript.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
   release:
     types:
       - published
@@ -18,12 +16,16 @@ env:
   MPLBACKEND: Agg
   UV_SYSTEM_PYTHON: 1
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   subscript:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13"]
 
     steps:
 
@@ -38,53 +40,39 @@ 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 }}
 
-      - name: Install OPM-flow and ResInsight (for testing)
+      - name: Install OPM-flow (for testing)
         run: |
           sudo apt-get install software-properties-common
           sudo apt-add-repository ppa:opm/ppa
           sudo apt-get update
           sudo apt-get install mpi-default-bin
           sudo apt-get install libopm-simulators-bin
-          sudo apt-get install resinsight
 
       - name: Install subscript with dependencies
         if: ${{ always() }}
         run: |
           uv pip install ".[tests, docs]"
 
-      - name: Log OPM-Flow and ResInsight version
+      - name: Log OPM-Flow version
         run: |
           flow --version
-          ResInsight --console --version
 
       - name: List all installed packages
         run: uv pip freeze
 
-      - name: Format with ruff
-        if: ${{ always() }}
-        run: ruff format . --check
-
-      - name: Lint with ruff
-        if: ${{ always() }}
-        run: ruff check .
-
-      - name: Check typing with mypy
-        if: ${{ always() }}
-        run: mypy src/subscript
-
       - name: Run tests
         if: ${{ always() }}
-        run: pytest -n auto tests --mpl
+        run: pytest -n logical tests --mpl
 
       - name: Syntax check documentation
         if: ${{ always() }}

{subscript-1.14.2 → subscript-1.14.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subscript
-Version: 1.14.2
+Version: 1.14.4
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -691,6 +691,7 @@ Classifier: Topic :: Utilities
 Classifier: Operating System :: POSIX :: Linux
 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
@@ -701,18 +702,16 @@ Requires-Dist: res2df
 Requires-Dist: ert>=10.2.0b13
 Requires-Dist: fmu-tools
 Requires-Dist: grid3d_maps
+Requires-Dist: jinja2
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: opm>=2023.04
 Requires-Dist: pandas
+Requires-Dist: pydantic
 Requires-Dist: pyscal
 Requires-Dist: pyyaml
-Requires-Dist: rips
 Requires-Dist: scipy
 Requires-Dist: seaborn
-Requires-Dist: segyio
-Requires-Dist: shapely
-Requires-Dist: xlrd
 Requires-Dist: xtgeo
 Provides-Extra: tests
 Requires-Dist: mypy; extra == "tests"
@@ -727,6 +726,9 @@ Requires-Dist: ruff; extra == "tests"
 Requires-Dist: types-Jinja2; extra == "tests"
 Requires-Dist: types-PyYAML; extra == "tests"
 Requires-Dist: types-python-dateutil; extra == "tests"
+Requires-Dist: pandas-stubs; extra == "tests"
+Requires-Dist: types-seaborn; extra == "tests"
+Requires-Dist: scipy-stubs; extra == "tests"
 Provides-Extra: docs
 Requires-Dist: autoapi; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"
@@ -740,8 +742,8 @@ Dynamic: license-file
 # subscript
 
 [![subscript](https://github.com/equinor/subscript/actions/workflows/subscript.yml/badge.svg)](https://github.com/equinor/subscript/actions/workflows/subscript.yml)
-[![codecov](https://codecov.io/gh/equinor/subscript/branch/master/graph/badge.svg)](https://codecov.io/gh/equinor/subscript)
-![Python Version](https://img.shields.io/badge/python-3.11%20%7C%203.12-blue.svg)
+[![codecov](https://codecov.io/gh/equinor/subscript/branch/main/graph/badge.svg)](https://codecov.io/gh/equinor/subscript)
+![Python Version](https://img.shields.io/badge/python-3.11%20%7C%203.12%20%7C%203.13-blue.svg)
 [![License: GPL v3](https://img.shields.io/github/license/equinor/subscript)](https://www.gnu.org/licenses/gpl-3.0)
 [![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)
 

{subscript-1.14.2 → subscript-1.14.4}/README.md

@@ -1,8 +1,8 @@
 # subscript
 
 [![subscript](https://github.com/equinor/subscript/actions/workflows/subscript.yml/badge.svg)](https://github.com/equinor/subscript/actions/workflows/subscript.yml)
-[![codecov](https://codecov.io/gh/equinor/subscript/branch/master/graph/badge.svg)](https://codecov.io/gh/equinor/subscript)
-![Python Version](https://img.shields.io/badge/python-3.11%20%7C%203.12-blue.svg)
+[![codecov](https://codecov.io/gh/equinor/subscript/branch/main/graph/badge.svg)](https://codecov.io/gh/equinor/subscript)
+![Python Version](https://img.shields.io/badge/python-3.11%20%7C%203.12%20%7C%203.13-blue.svg)
 [![License: GPL v3](https://img.shields.io/github/license/equinor/subscript)](https://www.gnu.org/licenses/gpl-3.0)
 [![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)
 

{subscript-1.14.2 → subscript-1.14.4}/ci/testkomodo.sh

@@ -12,12 +12,13 @@ get_os_arch () {
 
     rhel7=$(echo "$uname_info" | grep "el7")
     rhel8=$(echo "$uname_info" | grep "el8")
+    rhel9=$(echo "$uname_info" | grep "el9")
 
     os_arch="undetermined"
 
     if [ "$rhel7" ]; then
         os_arch="x86_64_RH_7"
-    elif [ "$rhel8" ]; then
+    elif [ "$rhel8" ] || [ "$rhel9" ]; then
         os_arch="x86_64_RH_8"
     else
         echo "$os_arch"
@@ -36,6 +37,6 @@ start_tests () {
     # (this script becomes flaky if set -e is active)
     source /prog/res/ecl/script/eclrun.bash
     eval "$SHELLOPTS_BEFORE"
-
+    export PATH=$PATH:/global/bin # For bjobsusers tests
     pytest -n auto --flow-simulator="/project/res/$os_arch/bin/flowdaily" --eclipse-simulator="eclrun"
 }

{subscript-1.14.2 → subscript-1.14.4}/docs/contributing.rst

@@ -10,7 +10,7 @@ Getting started
 ---------------
 
 We recommend developing from a personal fork rather than branches on the
-upstream repository. Create a fork from the repository and then clone it 
+upstream repository. Create a fork from the repository and then clone it
 to your machine:
 
 .. code-block:: console
@@ -24,7 +24,7 @@ Then add the upstream repository:
 
   git remote add upstream git@github.com:equinor/subscript
 
-After cloning, you need a Python virtual environment in which you install 
+After cloning, you need a Python virtual environment in which you install
 subscript and its dependencies. If you develop on an Equinor computer you
 should use ``komodoenv``; instructions for how to do this can be found
 `here <https://fmu-docs.equinor.com/docs/komodo/equinor_komodo_usage.html>`_
@@ -70,7 +70,7 @@ the linting done in CI:
 
  .. code-block:: console
 
-  ruff . 
+  ruff check .
   ruff format .
   mypy src/subscript
   rstcheck -r docs
@@ -92,20 +92,28 @@ Repository conventions
 ----------------------
 
 * Each tool has its own subdirectory under ``src/subscript``.
-* Use ``pyproject.toml`` for installing endpoints that users should have in 
+* Use ``pyproject.toml`` for installing endpoints that users should have in
   their ``$PATH``
-* Use ``argparse``, and with a specific ``get_parser()`` function to facilitate 
+* Use ``argparse``, and with a specific ``get_parser()`` function to facilitate
   ``sphinx-argparse``
-* Always use the ``if __name__ = "__main__"`` idiom. Scripts should not start 
+* Always use the ``if __name__ = "__main__"`` idiom. Scripts should not start
   if they are imported, this is to facilitate testing.
-* There must be at least test code that directly test that the endpoint is 
+* There must be at least test code that directly test that the endpoint is
   installed and that it does at least something to a standard input. Preferably
   unit test code for isolated parts of the code as well.
 * Docstrings on all functions. Docstrings can include RST formatting and will
-  be checked for compliance with sphinx on every pull request. Warnings from 
+  be checked for compliance with sphinx on every pull request. Warnings from
   sphinx must be fixed.
 * For a new script, write a new file ``docs/scripts/scriptname.rst`` describing
-  the script, its usage, and examples. Use sphinx-argparse to document the 
+  the script, its usage, and examples. Use sphinx-argparse to document the
   command line syntax.
 * Type hinting is encouraged. If type hinting is included in the source, it has
   to pass mypy.
+
+
+ERT plugin
+----------
+
+One can hook a script to `ERT` as a forward model by adding it to the
+``src/subscript/hook_implementations/forward_model_steps.py`` and
+``tests/test_hook_implementations.py`` files.

{subscript-1.14.2 → subscript-1.14.4}/docs/overview.rst

@@ -11,6 +11,7 @@ bjobsusers                ✅   ⛔️                 ⛔️
 casegen_upcars            ✅   ⛔️                 ⛔️
 check_swatinit            ✅   ✅                 ⛔️
 convert_grid_format [*]_  ✅   ✅                 ⛔️
+create_date_files         ✅   ✅                 ⛔️
 csv2ofmvol                ✅   ✅                 ⛔️
 csv_merge                 ✅   ⛔️                 ✅
 csv_stack                 ✅   ✅                 ✅
@@ -29,7 +30,6 @@ params2csv                ✅   ✅                 ✅
 presentvalue              ✅   ⛔️                 ⛔️
 prtvol2csv                ✅   ✅                 ⛔️
 restartthinner            ✅   ⛔️                 ⛔️
-ri_wellmod                ✅   ✅                 ⛔️
 rmsecl_volumetrics        ✅   ⛔️                 ⛔️
 sector2fluxnum            ✅   ⛔️                 ⛔️
 summaryplot               ✅   ⛔️                 ⛔️

subscript-1.14.4/docs/scripts/create_date_files.rst

@@ -0,0 +1,8 @@
+
+CREATE_DATE_FILES
+=================
+
+.. argparse::
+   :module: subscript.create_date_files.create_date_files
+   :func: get_parser
+   :prog: create_date_files

{subscript-1.14.2 → subscript-1.14.4}/pyproject.toml

@@ -28,6 +28,7 @@ classifiers = [
     "Operating System :: POSIX :: Linux",
     "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)",
 ]
@@ -38,18 +39,16 @@ dependencies = [
     "ert>=10.2.0b13",
     "fmu-tools",
     "grid3d_maps",
+    "jinja2",
     "matplotlib",
     "numpy",
     "opm>=2023.04",
     "pandas",
+    "pydantic",
     "pyscal",
     "pyyaml",
-    "rips",
     "scipy",
     "seaborn",
-    "segyio",
-    "shapely",
-    "xlrd",
     "xtgeo",
 ]
 
@@ -67,6 +66,9 @@ tests = [
     "types-Jinja2",
     "types-PyYAML",
     "types-python-dateutil",
+    "pandas-stubs",
+    "types-seaborn",
+    "scipy-stubs",
 ]
 docs = [
     "autoapi",
@@ -88,6 +90,7 @@ bjobsusers = "subscript.bjobsusers.bjobsusers:main"
 casegen_upcars = "subscript.casegen_upcars.casegen_upcars:main"
 check_swatinit = "subscript.check_swatinit.check_swatinit:main"
 convert_grid_format = "subscript.convert_grid_format.convert_grid_format:main"
+create_date_files = "subscript.create_date_files.create_date_files:main"
 csv2ofmvol = "subscript.csv2ofmvol.csv2ofmvol:main"
 csv_merge = "subscript.csv_merge.csv_merge:main"
 csv_stack = "subscript.csv_stack.csv_stack:main"
@@ -106,7 +109,6 @@ params2csv = "subscript.params2csv.params2csv:main"
 presentvalue = "subscript.presentvalue.presentvalue:main"
 prtvol2csv = "subscript.prtvol2csv.prtvol2csv:main"
 restartthinner = "subscript.restartthinner.restartthinner:main"
-ri_wellmod = "subscript.ri_wellmod.ri_wellmod:main"
 rmsecl_volumetrics = "subscript.rmsecl_volumetrics.rmsecl_volumetrics:main"
 sector2fluxnum = "subscript.sector2fluxnum.sector2fluxnum:main"
 summaryplot = "subscript.summaryplot.summaryplot:main"
@@ -136,12 +138,25 @@ script-files = [
 ]
 
 [tool.mypy]
-ignore_missing_imports = true
 
-[tool.pylint]
-# Module docstrings are not required, there are other means of documenting at
-# that level in subscript
-disable = "missing-module-docstring"
+plugins = ["pydantic.mypy"]
+
+strict_equality = true
+extra_checks = true
+
+[[tool.mypy.overrides]]
+module = [
+    "xtgeo.*",
+    "opm.*",
+    "resdata.*",
+    "res2df.*",
+    "ert",
+    "grid3d_maps.*",
+    "fmu.tools.*",
+    "cwrap",
+    "grpc"
+]
+ignore_missing_imports = true
 
 [tool.pytest.ini_options]
 norecursedirs = [
@@ -152,11 +167,10 @@ norecursedirs = [
     "build",
     "opm-common",
 ]
-addopts = "-ra --strict-markers --ignore=docs/conf.py --ignore=setup.py --ignore=.eggs"
+addopts = "-ra --strict-markers --ignore=docs/conf.py --ignore=.eggs"
 markers = [
     "integration: Marks a test as an integration test",
     "plot: Marks a test as interactive, plots will flash to the screen",
-    "ri_dev: A test using a dev version of ResInsight, skipped by default"
 ]
 
 [tool.rstcheck]
@@ -169,21 +183,32 @@ line-length = 88
 [tool.ruff.lint]
 select = [
     "C",
-    "E",
-    "F",
-    "I",
-    "PIE",
-    "Q",
-    "RET",
-    "RSE",
-    "SIM",
-    "W",
-    "PD",
+    "E",  # pycodestyle error
+    "F",  # pyflakes
+    "I",  # isort
+    "PIE",  # flake8-pie
+    "Q",  # flake8-quotes
+    "RET",  # flake8-return
+    "RSE",  # flake8-raise
+    "SIM",  # flake8-simplify
+    "W",  # pycodestyle warning
+    "PD",  # pandas-vet
+    "UP",  # pyupgrade
+    "RUF", # RUFF specific rules
+    "PL",  # pylint
+    "B",  # flake8-bugbear
 ]
 ignore = [
-    "C901",
-    "PD013",
+    "C901",  # complex-structure
+    "PD013",  # pandas-use-of-dot-stack
+    "PLR0915",  # too-many-statements
+    "PLR0912",  # too-many-branches
+    "PLR2004",  # magic-value-comparison
+    "PLW2901",  # redefined-loop-name
 ]
 
 [tool.ruff.lint.isort]
 combine-as-imports = true
+
+[tool.ruff.lint.pylint]
+max-args = 35

{subscript-1.14.2 → subscript-1.14.4}/src/subscript/__init__.py

@@ -1,32 +1,15 @@
 import logging
 import sys
-from pathlib import Path
 
 try:
     from importlib import metadata
 
     __version__ = metadata.version(__name__)
 except metadata.PackageNotFoundError:
-    pass
-
-
-def detect_os(release_file: Path = Path("/etc/redhat-release")) -> str:
-    """Detect operating system string in runtime, just use default if not found."""
-    default_os_version = "x86_64_RH_7"
-
-    if release_file.is_file():
-        with open(release_file, "r", encoding="utf-8") as buffer:
-            tokens = buffer.read().split()
-            for t in tokens:
-                if "." in t:
-                    major = t.split(".")[0]
-                    return f"x86_64_RH_{major}"
-        raise ValueError("Could not detect RHEL version")
-    return default_os_version
+    __version__ = "0.0.0"
 
 
 def getLogger(module_name="subscript"):
-    # pylint: disable=invalid-name
     """Provides a unified logger for subscript scripts.
 
     Scripts in subscript are encouraged to use logging.info() instead of
@@ -57,11 +40,6 @@ def getLogger(module_name="subscript"):
     if not module_name:
         return getLogger("subscript")
 
-    # This logger is also used by subscript-internal, but we
-    # don't want to expose that detail and repo difference in
-    # the log output:
-    module_name = module_name.replace("subscript_internal", "subscript")
-
     compressed_name = []
     for elem in module_name.split("."):
         if len(compressed_name) == 0 or elem != compressed_name[-1]:

{subscript-1.14.2 → subscript-1.14.4}/src/subscript/bjobsusers/bjobsusers.py

@@ -2,7 +2,7 @@ import argparse
 import os
 import re
 import subprocess
-from typing import Callable
+from collections.abc import Callable
 
 import pandas as pd
 

{subscript-1.14.2 → subscript-1.14.4}/src/subscript/casegen_upcars/casegen_upcars.py

@@ -59,7 +59,7 @@ def main():
     parser = arg_parse.parse_args()
 
     # YAML format
-    with open(parser.config_file, "r", encoding="utf8") as file_handle:
+    with open(parser.config_file, encoding="utf8") as file_handle:
         config = load(file_handle.read(), Loader=Loader)
 
         general = config["General"]
@@ -248,7 +248,7 @@ def main():
             throws_j2 = throws_section["j2"]
             throws_dz = throws_section["dz"]
             for _i1, _i2, _j1, _j2, _dz in zip(
-                throws_i1, throws_i2, throws_j1, throws_j2, throws_dz
+                throws_i1, throws_i2, throws_j1, throws_j2, throws_dz, strict=False
             ):
                 throws.append([_i1, _i2, _j1, _j2, _dz])
         else:
@@ -462,6 +462,7 @@ def main():
         [matrix_poro, matrix_multpv, matrix_multx, matrix_multy],
         [streak_poro, streak_multpv, streak_multx, streak_multy],
         [fracture_poro, fracture_multpv, fracture_multx, fracture_multy],
+        strict=False,
     ):
         grid.set_fracture_property(keyword, var_fracture)
         grid.set_layers_property(keyword, var_matrix, var_layer)
@@ -494,6 +495,7 @@ def main():
             [vug1_satnum, vug2_satnum, vug3_satnum],
             [vug1_swatinit, vug2_swatinit, vug3_swatinit],
         ],
+        strict=False,
     ):
         logger.info("Exporting " + keyword + " include file")
         include_file = f"{keyword.lower()}_file"
@@ -518,7 +520,7 @@ def main():
         [vug1_swatinit, vug2_swatinit],
     )
 
-    with open(template_file, "r", encoding="utf8") as file_handle:
+    with open(template_file, encoding="utf8") as file_handle:
         buffer_ = mask_token(file_handle.read(), unmask=False)
         case_template = env.from_string(buffer_)
         ast = env.parse(buffer_)