subscript 1.14.3__tar.gz → 1.14.4__tar.gz

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

@@ -1,7 +1,6 @@
 name: codecoverage
 on:
   pull_request:
-    branches: [main]
   push:
     branches: [main]
 
@@ -30,12 +29,12 @@ 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"

{subscript-1.14.3 → subscript-1.14.4}/.github/workflows/linting.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.12"]
+        python-version: ["3.13"]
 
     steps:
       - name: Checkout commit locally
@@ -40,7 +40,7 @@ jobs:
           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 }}

{subscript-1.14.3 → 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.3 → subscript-1.14.4}/.github/workflows/subscript.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
   release:
     types:
       - published
@@ -27,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13"]
 
     steps:
 
@@ -42,12 +40,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 }}

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subscript
-Version: 1.14.3
+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,6 +702,7 @@ 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
@@ -741,7 +743,7 @@ Dynamic: license-file
 
 [![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/main/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)
+![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.3 → subscript-1.14.4}/README.md

@@ -2,7 +2,7 @@
 
 [![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/main/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)
+![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.3 → 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"

{subscript-1.14.3 → 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.3 → 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                 ✅   ✅                 ✅

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.3 → 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,6 +39,7 @@ dependencies = [
     "ert>=10.2.0b13",
     "fmu-tools",
     "grid3d_maps",
+    "jinja2",
     "matplotlib",
     "numpy",
     "opm>=2023.04",
@@ -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"
@@ -148,20 +151,13 @@ module = [
     "resdata.*",
     "res2df.*",
     "ert",
-    "resfo",
     "grid3d_maps.*",
     "fmu.tools.*",
-    "pyscal",
     "cwrap",
     "grpc"
 ]
 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"
-
 [tool.pytest.ini_options]
 norecursedirs = [
     ".git",
@@ -187,23 +183,32 @@ line-length = 88
 [tool.ruff.lint]
 select = [
     "C",
-    "E",
-    "F",
-    "I",
-    "PIE",
-    "Q",
-    "RET",
-    "RSE",
-    "SIM",
-    "W",
-    "PD",
-    "UP",
-    "RUF",
+    "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.3 → subscript-1.14.4}/src/subscript/__init__.py

@@ -1,28 +1,12 @@
 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, 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"):
@@ -56,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.3 → subscript-1.14.4}/src/subscript/casegen_upcars/casegen_upcars.py

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

{subscript-1.14.3 → subscript-1.14.4}/src/subscript/casegen_upcars/model.py

@@ -20,13 +20,12 @@ def fracture_idx(matrix_elements, fracture_cell_count, boundary_fracture):
         for idx in matrix_elements:
             offset += idx + fracture_cell_count
             result.append(offset)
-    else:
-        if len(matrix_elements) > 1:
-            offset = matrix_elements[0]
+    elif len(matrix_elements) > 1:
+        offset = matrix_elements[0]
+        result.append(offset)
+        for idx in matrix_elements[1:-1]:
+            offset += idx + fracture_cell_count
             result.append(offset)
-            for idx in matrix_elements[1:-1]:
-                offset += idx + fracture_cell_count
-                result.append(offset)
     return np.asarray(result, dtype=np.int16)
 
 
@@ -107,7 +106,7 @@ class Model:
 
         prts = [-1] * nz
         if streak_k is not None:
-            for idx, (_k, _nz) in enumerate(zip(streak_k, streak_nz)):
+            for idx, (_k, _nz) in enumerate(zip(streak_k, streak_nz, strict=False)):
                 if _nz > 0:
                     if _k - 1 < 0 or _k + _nz - 1 > nz:
                         print(
@@ -170,21 +169,20 @@ class Model:
         self._fracture_offset_x = listify(fracture_offset_x, self._n_faults_y, float)
         self._fracture_height_x = listify(fracture_height_x, self._n_faults_y, float)
         self._fracture_zoffset_x = listify(fracture_zoffset_x, self._n_faults_y, float)
-        for idx, (var, title) in enumerate(
-            zip(
-                [
-                    self._fracture_length_x,
-                    self._fracture_offset_x,
-                    self._fracture_height_x,
-                    self._fracture_zoffset_x,
-                ],
-                [
-                    "fracture length",
-                    "fracture offset",
-                    "fracture height",
-                    "fracture vertical offset",
-                ],
-            )
+        for var, title in zip(
+            [
+                self._fracture_length_x,
+                self._fracture_offset_x,
+                self._fracture_height_x,
+                self._fracture_zoffset_x,
+            ],
+            [
+                "fracture length",
+                "fracture offset",
+                "fracture height",
+                "fracture vertical offset",
+            ],
+            strict=False,
         ):
             if len(var) != self._n_faults_y:
                 raise ValueError(
@@ -197,21 +195,20 @@ class Model:
         self._fracture_offset_y = listify(fracture_offset_y, self._n_faults_x, float)
         self._fracture_height_y = listify(fracture_height_y, self._n_faults_x, float)
         self._fracture_zoffset_y = listify(fracture_zoffset_y, self._n_faults_x, float)
-        for idx, (var, title) in enumerate(
-            zip(
-                [
-                    self._fracture_length_y,
-                    self._fracture_offset_y,
-                    self._fracture_height_y,
-                    self._fracture_zoffset_y,
-                ],
-                [
-                    "fracture length",
-                    "fracture offset",
-                    "fracture height",
-                    "fracture vertical offset",
-                ],
-            )
+        for var, title in zip(
+            [
+                self._fracture_length_y,
+                self._fracture_offset_y,
+                self._fracture_height_y,
+                self._fracture_zoffset_y,
+            ],
+            [
+                "fracture length",
+                "fracture offset",
+                "fracture height",
+                "fracture vertical offset",
+            ],
+            strict=False,
         ):
             if len(var) != self._n_faults_x:
                 raise ValueError(
@@ -273,7 +270,7 @@ class Model:
         self._streak_idx = np.full((self._total_nx, self._total_ny, self._total_nz), -1)
         offset = 0
         streak_idx = -1
-        for idx, (_prt, _nz) in enumerate(zip(layer_prt, layer_nz)):
+        for _prt, _nz in zip(layer_prt, layer_nz, strict=False):
             if _prt >= 0:
                 # Streak
                 streak_idx += 1
@@ -846,7 +843,7 @@ Initializing model
                 list_value.append(props[idx])
                 list_count.append(1)
         string_buffer = ""
-        for idx, (count, value) in enumerate(zip(list_count, list_value)):
+        for count, value in zip(list_count, list_value, strict=False):
             string_new = (
                 (" {0}*{1:" + value_format + "}").format(count, value)
                 if count > 1
@@ -1021,7 +1018,7 @@ Initializing model
             )
             streak_box = []
             for _k, nz_size, rect in zip(
-                self._streak_k, self._streak_nz, self._streak_rect
+                self._streak_k, self._streak_nz, self._streak_rect, strict=False
             ):
                 _k -= 1
                 box = self.bounded_box(

{subscript-1.14.3 → subscript-1.14.4}/src/subscript/check_swatinit/check_swatinit.py

@@ -492,7 +492,7 @@ def _evaluate_pc(
         swls = np.full(len(swats), sw_min)
     if swus is None:
         swus = np.full(len(swats), sw_max)
-    for swat, pc_scaling, swl, swu in zip(swats, scale_vert, swls, swus):
+    for swat, pc_scaling, swl, swu in zip(swats, scale_vert, swls, swus, strict=False):
         p_cap.append(
             np.interp(
                 swat,

{subscript-1.14.3 → subscript-1.14.4}/src/subscript/convert_grid_format/convert_grid_format.py

@@ -6,8 +6,8 @@ import os
 import sys
 from pathlib import Path
 
-import xtgeo  # type: ignore
-from xtgeo.common import XTGeoDialog  # type: ignore
+import xtgeo
+from xtgeo.common import XTGeoDialog
 
 from subscript import __version__