subscript 1.14.4__tar.gz → 1.14.6__tar.gz

subscript-1.14.6/.github/dependabot.yml

@@ -0,0 +1,7 @@
+---
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

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

@@ -26,7 +26,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install libegl1
 
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Setup Python
       uses: actions/setup-python@v6

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

@@ -30,12 +30,12 @@ jobs:
 
     steps:
       - name: Checkout commit locally
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         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 }}
 

{subscript-1.14.4 → subscript-1.14.6}/.github/workflows/publish.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

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

@@ -26,16 +26,24 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.11", "3.12", "3.13"]
+        pandas-version: [""]
+        include:
+          - python-version: "3.13"
+            pandas-version: ">=2,<3"
+          - python-version: "3.13"
+            pandas-version: ">=3.0.0"
+        exclude:
+          - python-version: "3.13"
+            pandas-version: ""
 
     steps:
-
       - name: Install Ubuntu dependencies
         run: |
           sudo apt-get update
           sudo apt-get install libegl1
 
       - name: Checkout commit locally
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -63,6 +71,10 @@ jobs:
         run: |
           uv pip install ".[tests, docs]"
 
+      - name: Pin pandas version
+        if: matrix.pandas-version
+        run: uv pip install "pandas${{ matrix.pandas-version }}"
+
       - name: Log OPM-Flow version
         run: |
           flow --version

subscript-1.14.6/PKG-INFO

@@ -0,0 +1,116 @@
+Metadata-Version: 2.4
+Name: subscript
+Version: 1.14.6
+Summary: Equinor's collection of subsurface reservoir modelling scripts
+Author-email: Equinor <rnyb@equinor.com>
+License-Expression: GPL-3.0-only
+Project-URL: Homepage, https://github.com/equinor/subscript
+Project-URL: Repository, https://github.com/equinor/subscript
+Project-URL: Documentation, https://equinor.github.io/subscript
+Keywords: energy,subsurface,reservoir,scientific,engineering
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Science/Research
+Classifier: Topic :: Scientific/Engineering
+Classifier: Topic :: Scientific/Engineering :: Physics
+Classifier: Topic :: Software Development :: Libraries
+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
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: resdata
+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>=2
+Requires-Dist: pydantic
+Requires-Dist: pyscal
+Requires-Dist: pyyaml
+Requires-Dist: scipy
+Requires-Dist: seaborn
+Requires-Dist: xtgeo
+Provides-Extra: tests
+Requires-Dist: mypy; extra == "tests"
+Requires-Dist: pytest; extra == "tests"
+Requires-Dist: pytest-cov; extra == "tests"
+Requires-Dist: pytest-mock; extra == "tests"
+Requires-Dist: pytest-mpl; extra == "tests"
+Requires-Dist: pytest-xdist; extra == "tests"
+Requires-Dist: rstcheck; extra == "tests"
+Requires-Dist: rstcheck-core; extra == "tests"
+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<9; extra == "docs"
+Requires-Dist: sphinx-argparse; extra == "docs"
+Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
+Requires-Dist: sphinx-copybutton; extra == "docs"
+Requires-Dist: sphinx-togglebutton; extra == "docs"
+Requires-Dist: sphinx_rtd_theme>=3.1.0.rc1; extra == "docs"
+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/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** is Equinor's collection of scripts used for subsurface reservoir modelling.
+
+---
+
+## Quick Reference
+
+* [**Documentation**](https://equinor.github.io/subscript)
+* [**Installation**](#installation)
+* [**Usage**](#usage)
+* [**Contributing**](https://equinor.github.io/subscript/contributing.html)
+
+---
+
+## Installation
+
+subscript can be installed via pip
+
+```sh
+pip install subscript
+```
+
+## Usage
+
+As a collection of utilities subscript has many different invocations and
+use cases. A complete overview can be found in the
+[documentation](https://equinor.github.io/subscript)
+for a complete overview.
+
+Note that some of these utilities may depend upon commercial third-party
+software.
+
+
+## Developing & Contributing
+
+All contributions are welcome. Please see the
+[Contributing document](https://equinor.github.io/subscript/contributing.html)
+for more details and instructions for getting started.
+
+
+## Documentation
+
+The documentation can be found at https://equinor.github.io/subscript

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

@@ -6,14 +6,15 @@ requires = [
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
-write_to = "src/subscript/version.py"
+version_file = "src/subscript/version.py"
 
 [project]
 name = "subscript"
 description = "Equinor's collection of subsurface reservoir modelling scripts"
 readme = "README.md"
 requires-python = ">=3.11"
-license = { file = "LICENSE" }
+license = "GPL-3.0-only"
+license-files = ["LICENSE"]
 authors = [
     { name = "Equinor", email = "rnyb@equinor.com" },
 ]
@@ -30,7 +31,6 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Natural Language :: English",
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
 ]
 dynamic = ["version"]
 dependencies = [
@@ -43,7 +43,7 @@ dependencies = [
     "matplotlib",
     "numpy",
     "opm>=2023.04",
-    "pandas",
+    "pandas >= 2",
     "pydantic",
     "pyscal",
     "pyyaml",
@@ -72,12 +72,12 @@ tests = [
 ]
 docs = [
     "autoapi",
-    "sphinx",
+    "sphinx < 9",
     "sphinx-argparse",
     "sphinx-autodoc-typehints",
     "sphinx-copybutton",
     "sphinx-togglebutton",
-    "sphinx_rtd_theme",
+    "sphinx_rtd_theme >= 3.1.0.rc1",
 ]
 
 [project.urls]
@@ -149,7 +149,6 @@ module = [
     "xtgeo.*",
     "opm.*",
     "resdata.*",
-    "res2df.*",
     "ert",
     "grid3d_maps.*",
     "fmu.tools.*",
@@ -197,7 +196,11 @@ select = [
     "RUF", # RUFF specific rules
     "PL",  # pylint
     "B",  # flake8-bugbear
+    "ANN",  # flake8-annotations
 ]
+
+preview = true
+
 ignore = [
     "C901",  # complex-structure
     "PD013",  # pandas-use-of-dot-stack
@@ -205,8 +208,22 @@ ignore = [
     "PLR0912",  # too-many-branches
     "PLR2004",  # magic-value-comparison
     "PLW2901",  # redefined-loop-name
+    "PLC2701", # import-private-name
+    "PLR0914", # too-many-locals
+    "PLR6301", # no-self-use
+    "PLR0904", # too-many-public-methods
+    "PLR1702", # too-many-nested-blocks
+    "RUF067",  # non empty init module
+    "PLC1901",  # compare-to-empty-string
 ]
 
+[tool.ruff.lint.extend-per-file-ignores]
+"src/subscript/sunsch/time_vector.py" = ["ANN"]
+"src/subscript/casegen_upcars/*" = ["ANN"]
+"src/subscript/field_statistics/*" = ["ANN"]
+"src/subscript/fmu_copy_revision/*" = ["ANN"]
+"tests/*" = ["ANN"]
+
 [tool.ruff.lint.isort]
 combine-as-imports = true
 

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

@@ -9,7 +9,7 @@ except metadata.PackageNotFoundError:
     __version__ = "0.0.0"
 
 
-def getLogger(module_name="subscript"):
+def getLogger(module_name: str = "subscript") -> logging.Logger:
     """Provides a unified logger for subscript scripts.
 
     Scripts in subscript are encouraged to use logging.info() instead of
@@ -40,7 +40,7 @@ def getLogger(module_name="subscript"):
     if not module_name:
         return getLogger("subscript")
 
-    compressed_name = []
+    compressed_name: list[str] = []
     for elem in module_name.split("."):
         if len(compressed_name) == 0 or elem != compressed_name[-1]:
             compressed_name.append(elem)

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

@@ -247,10 +247,10 @@ def main():
             throws_j1 = throws_section["j1"]
             throws_j2 = throws_section["j2"]
             throws_dz = throws_section["dz"]
-            for _i1, _i2, _j1, _j2, _dz in zip(
+            for i1, i2, j1, j2, dz in zip(
                 throws_i1, throws_i2, throws_j1, throws_j2, throws_dz, strict=False
             ):
-                throws.append([_i1, _i2, _j1, _j2, _dz])
+                throws.append([i1, i2, j1, j2, dz])
         else:
             throws = []
             for throw in parser.throws:
@@ -548,8 +548,8 @@ def main():
         ]
         file_list.insert(0, dictionary["GRDECL_file"])
         with open(parser.debug_model, "wb", encoding="utf8") as wfd:
-            for _file in file_list:
-                with open(_file, "rb") as file_handle:
+            for file in file_list:
+                with open(file, "rb") as file_handle:
                     shutil.copyfileobj(file_handle, wfd)
 
 

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

@@ -100,15 +100,15 @@ class Model:
             elif isinstance(streak_rect[0], list):
                 streak_rect = [streak_rect[0]] * len(streak_k)
             else:
-                streak_rect = streak_rect * len(streak_k)
+                streak_rect *= len(streak_k)
         else:
             streak_rect = [None] * len(streak_k)
 
         prts = [-1] * nz
         if streak_k is not None:
-            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:
+            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(
                             TERMINALCOLORS["WARNING"]
                             + f"Warning: Streak #{idx + 1} is outside "
@@ -116,7 +116,7 @@ class Model:
                             "The streak will be ignored." + TERMINALCOLORS["ENDC"]
                         )
                     else:
-                        prts[_k - 1 : _k + _nz - 1] = [idx] * _nz
+                        prts[k - 1 : k + nz_ - 1] = [idx] * nz_
 
         layer_nz = []
         layer_dz = []
@@ -270,26 +270,26 @@ class Model:
         self._streak_idx = np.full((self._total_nx, self._total_ny, self._total_nz), -1)
         offset = 0
         streak_idx = -1
-        for _prt, _nz in zip(layer_prt, layer_nz, strict=False):
-            if _prt >= 0:
+        for prt, nz_ in zip(layer_prt, layer_nz, strict=False):
+            if prt >= 0:
                 # Streak
                 streak_idx += 1
-                _rect = streak_rect[_prt]
-                if _rect is None or len(_rect) == 0:
+                rect = streak_rect[prt]
+                if rect is None or len(rect) == 0:
                     box_i1 = 0
                     box_i2 = self._total_nx - 1
                     box_j1 = 0
                     box_j2 = self._total_ny - 1
                 else:
-                    box_i1 = max(0, _rect[0] - 1)
-                    box_i2 = min(self._total_nx - 1, _rect[1] - 1)
-                    box_j1 = max(0, _rect[2] - 1)
-                    box_j2 = min(self._total_ny - 1, _rect[3] - 1)
+                    box_i1 = max(0, rect[0] - 1)
+                    box_i2 = min(self._total_nx - 1, rect[1] - 1)
+                    box_j1 = max(0, rect[2] - 1)
+                    box_j2 = min(self._total_ny - 1, rect[3] - 1)
                 self._streak_rect[streak_idx] = [box_i1, box_i2, box_j1, box_j2]
                 self._streak_idx[
-                    box_i1 : box_i2 + 1, box_j1 : box_j2 + 1, offset : offset + _nz
-                ] = _prt
-            offset += _nz
+                    box_i1 : box_i2 + 1, box_j1 : box_j2 + 1, offset : offset + nz_
+                ] = prt
+            offset += nz_
 
         # Layer Index
         self._layer_idx = np.empty(
@@ -298,10 +298,10 @@ class Model:
         self._layer_dz = np.zeros(self._total_nz)
         # self._layer_nz = layer_nz
         offset = 0
-        for idx, _layer_nz in enumerate(layer_nz):
-            self._layer_idx[:, :, offset : offset + _layer_nz] = idx
-            self._layer_dz[offset : offset + _layer_nz] = layer_dz[idx]
-            offset += _layer_nz
+        for idx, layer_nz_ in enumerate(layer_nz):
+            self._layer_idx[:, :, offset : offset + layer_nz_] = idx
+            self._layer_dz[offset : offset + layer_nz_] = layer_dz[idx]
+            offset += layer_nz_
 
         self._matrix_props = {
             "PORO": 0.0,
@@ -407,10 +407,10 @@ Initializing model
             (self._total_nx, self._total_ny, self._total_nz), dtype=np.int16
         )
         # Use length instead of number of cells
-        for _i, idx in enumerate(self._fracture_i):
-            fracture_length = max(0.0, min(1.0, self._fracture_length_y[_i])) * self._ly
+        for i, idx in enumerate(self._fracture_i):
+            fracture_length = max(0.0, min(1.0, self._fracture_length_y[i])) * self._ly
             start_fracture = (
-                min(self._fracture_offset_y[_i], 1.0 - self._fracture_length_y[_i])
+                min(self._fracture_offset_y[i], 1.0 - self._fracture_length_y[i])
                 * self._ly
             )
             start_fracture_idx = np.abs(self._y - start_fracture).argmin()
@@ -418,9 +418,9 @@ Initializing model
                 self._y - (start_fracture + fracture_length)
             ).argmin()
 
-            fracture_height = max(0.0, min(1.0, self._fracture_height_y[_i])) * self._lz
+            fracture_height = max(0.0, min(1.0, self._fracture_height_y[i])) * self._lz
             start_fracture_vert = (
-                min(self._fracture_zoffset_y[_i], 1.0 - self._fracture_height_y[_i])
+                min(self._fracture_zoffset_y[i], 1.0 - self._fracture_height_y[i])
                 * self._lz
             )
             start_fracture_k = np.abs(self._z - start_fracture_vert).argmin()
@@ -432,12 +432,12 @@ Initializing model
                 idx : idx + self._fracture_cell_count,
                 start_fracture_idx:end_fracture_idx,
                 start_fracture_k : end_fracture_k + 1,
-            ] = _i + 1
+            ] = i + 1
 
-        for _i, idx in enumerate(self._fracture_j):
-            fracture_length = max(0.0, min(1.0, self._fracture_length_x[_i])) * self._lx
+        for i, idx in enumerate(self._fracture_j):
+            fracture_length = max(0.0, min(1.0, self._fracture_length_x[i])) * self._lx
             start_fracture = (
-                min(self._fracture_offset_x[_i], 1.0 - self._fracture_length_x[_i])
+                min(self._fracture_offset_x[i], 1.0 - self._fracture_length_x[i])
                 * self._lx
             )
             start_fracture_idx = np.abs(self._x - start_fracture).argmin()
@@ -445,9 +445,9 @@ Initializing model
                 self._x - (start_fracture + fracture_length)
             ).argmin()
 
-            fracture_height = max(0.0, min(1.0, self._fracture_height_x[_i])) * self._lz
+            fracture_height = max(0.0, min(1.0, self._fracture_height_x[i])) * self._lz
             start_fracture_vert = (
-                min(self._fracture_zoffset_x[_i], 1.0 - self._fracture_height_x[_i])
+                min(self._fracture_zoffset_x[i], 1.0 - self._fracture_height_x[i])
                 * self._lz
             )
             start_fracture_k = np.abs(self._z - start_fracture_vert).argmin()
@@ -458,7 +458,7 @@ Initializing model
                 start_fracture_idx:end_fracture_idx,
                 idx : idx + self._fracture_cell_count,
                 start_fracture_k : end_fracture_k + 1,
-            ] = -(_i + 1)
+            ] = -(i + 1)
 
     def _build_grid(self):
         """Create the mesh xv, yv and zv"""
@@ -796,13 +796,13 @@ Initializing model
         print("/", file=buffer_)
 
         print("COORD", file=buffer_)
-        for _i in range(self._xv.shape[0]):
-            for _j in range(self._xv.shape[1]):
+        for i in range(self._xv.shape[0]):
+            for j in range(self._xv.shape[1]):
                 print(
                     "{{x:{0}}} {{y:{0}}} {{z:{0}}} "  # noqa: UP032
                     "{{x:{0}}} {{y:{0}}} {{z:{0}}}".format(
                         self._eclipse_output_float
-                    ).format(x=self._xv[_i, _j], y=self._yv[_i, _j], z=0.0),
+                    ).format(x=self._xv[i, j], y=self._yv[i, j], z=0.0),
                     file=buffer_,
                 )
         print("/", file=buffer_)
@@ -828,7 +828,7 @@ Initializing model
 
     def _print_property(self, stream, keyword, array_value):
         props = array_value.reshape(array_value.size, order="f")
-        if array_value.dtype.str[1] in ["i", "u"]:
+        if array_value.dtype.str[1] in {"i", "u"}:
             value_format = ""
         else:
             value_format = self._eclipse_output_float_compact
@@ -1017,17 +1017,17 @@ Initializing model
                 )
             )
             streak_box = []
-            for _k, nz_size, rect in zip(
+            for k, nz_size, rect in zip(
                 self._streak_k, self._streak_nz, self._streak_rect, strict=False
             ):
-                _k -= 1
+                k -= 1
                 box = self.bounded_box(
                     rect[0] - near_streak_vug_distance_to_streak,
                     rect[1] + near_streak_vug_distance_to_streak,
                     rect[2] - near_streak_vug_distance_to_streak,
                     rect[3] + near_streak_vug_distance_to_streak,
-                    _k - near_streak_vug_distance_to_streak,
-                    _k + nz_size - 1 + near_streak_vug_distance_to_streak,
+                    k - near_streak_vug_distance_to_streak,
+                    k + nz_size - 1 + near_streak_vug_distance_to_streak,
                 )
                 streak_box.append(box)
                 streak_domain_flag[

{subscript-1.14.4 → subscript-1.14.6}/src/subscript/casegen_upcars/udf.py

@@ -41,7 +41,7 @@ def listify(source, count, conversion_func=None):
     if isinstance(source, list):
         # Adjust the size when it is only 1 item
         if len(source) == 1:
-            source = source * count
+            source *= count
 
         if conversion_func is None:
             return source

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

@@ -55,8 +55,7 @@ def main() -> None:
         check_applicability(eclfiles)
 
         qc_frame = make_qc_gridframe(eclfiles)
-
-        if args.output != "":
+        if args.output:
             logger.info("Exporting CSV to %s", args.output)
             reorder_dframe_for_nonnans(qc_frame).to_csv(args.output, index=False)
 
@@ -65,7 +64,7 @@ def main() -> None:
         return
     qc_vols = qc_volumes(qc_frame)
     print(human_report_qc_vols(qc_vols))
-    qcsum = qc_vols["SWATINIT_WVOL"] + sum([qc_vols[qc_flag] for qc_flag in QC_FLAGS])
+    qcsum = qc_vols["SWATINIT_WVOL"] + sum(qc_vols[qc_flag] for qc_flag in QC_FLAGS)
     diff = qc_vols["SWAT_WVOL"] - qcsum
     if not np.isclose(diff, 0, atol=1e-6):
         print(f"Unexplained difference: {diff} Rm3")

{subscript-1.14.4 → subscript-1.14.6}/src/subscript/check_swatinit/pillarmodel.py

@@ -34,7 +34,7 @@ class PillarModel:
         filleps: str = "FILLEPS",
         rptrst: str = "ALLPROPS",
         unifout: str = "UNIFOUT",
-    ):
+    ) -> None:
         """Set up a reservoir grid and dynamic model that can be
         exported as an Eclipse deck.
 

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

@@ -4,6 +4,7 @@ import argparse
 import logging
 import os
 import sys
+from collections.abc import Sequence
 from pathlib import Path
 
 import xtgeo
@@ -88,7 +89,7 @@ def get_parser() -> argparse.ArgumentParser:
     return parser
 
 
-def _do_parse_args(args):
+def _do_parse_args(args: Sequence[str] | None) -> argparse.Namespace:
     """Parse command line arguments"""
 
     if args is None:
@@ -96,14 +97,12 @@ def _do_parse_args(args):
 
     parser = get_parser()
 
-    args = parser.parse_args(args)
-
     if len(sys.argv[1:]) < 2:
         parser.print_help()
         print("QUIT")
         sys.exit(0)
 
-    return args
+    return parser.parse_args(args)
 
 
 def _convert_ecl2roff(
@@ -125,7 +124,7 @@ def _convert_ecl2roff(
     if option:  # standardfmu separator
         filesep = "--"
 
-    if mode in ["grid", "init", "restart"]:
+    if mode in {"grid", "init", "restart"}:
         logger.info("Running GRID conversion...")
 
         logger.info("Convert from EGRID to ROFF...")
@@ -139,7 +138,7 @@ def _convert_ecl2roff(
     else:
         raise SystemExit(f"STOP! Invalid mode: <{mode}>")
 
-    if mode in ("restart", "init"):
+    if mode in {"restart", "init"}:
         xtg.say(f"Mode is {mode}")
         logger.info("Running %s conversion...", mode.upper())
         fname, fext = os.path.splitext(filename)
@@ -163,7 +162,7 @@ def _convert_ecl2roff(
         else:
             dates_list = None
 
-        if fext in (".UNRST", ".INIT", ""):
+        if fext in {".UNRST", ".INIT", ""}:
             usext = f".{fformat.upper()}"
             myprops = xtgeo.gridproperties_from_file(
                 fname + usext,
@@ -182,23 +181,28 @@ def _convert_ecl2roff(
             raise SystemExit("Invalid grid extention")
 
 
-def main(args=None) -> None:
+def main(args: Sequence[str] | None = None) -> None:
     """Entry-point"""
 
     XTGeoDialog.print_xtgeo_header(APPNAME, __version__)
 
-    args = _do_parse_args(args)
+    parsed_args = _do_parse_args(args)
 
-    logger.info(args)
+    logger.info(parsed_args)
 
-    if args.conversion not in set(CONVERSIONS):
+    if parsed_args.conversion not in set(CONVERSIONS):
         raise ValueError(
-            f"Illegal conversion <{args.conversion}>. Allowed are: {CONVERSIONS}"
+            f"Illegal conversion <{parsed_args.conversion}>. Allowed are: {CONVERSIONS}"
         )
 
     xtg.say("Running conversion...")
     _convert_ecl2roff(
-        args.infile, args.mode, args.outfile, args.stdfmu, args.propnames, args.dates
+        parsed_args.infile,
+        parsed_args.mode,
+        parsed_args.outfile,
+        parsed_args.stdfmu,
+        parsed_args.propnames,
+        parsed_args.dates,
     )
 
 

{subscript-1.14.4 → subscript-1.14.6}/src/subscript/create_date_files/create_date_files.py

@@ -66,7 +66,7 @@ def get_parser() -> argparse.ArgumentParser:
     return parser
 
 
-def is_iso_date_item(item: Any) -> bool:
+def is_iso_date_item(item: Any) -> bool:  # noqa: ANN401
     """
     Return True if item is:
     - a datetime.date or datetime.datetime, OR