subscript 1.2.2__tar.gz → 1.4.0__tar.gz

{subscript-1.2.2 → subscript-1.4.0}/.github/workflows/codecov.yml

@@ -16,10 +16,10 @@ jobs:
       PYTHON: '3.8'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.8
 

{subscript-1.2.2 → subscript-1.4.0}/.github/workflows/publish.yml

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

{subscript-1.2.2 → subscript-1.4.0}/.github/workflows/subscript.yml

@@ -22,16 +22,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - name: Checkout commit locally
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -60,17 +60,13 @@ jobs:
       - name: List all installed packages
         run: pip freeze
 
-      - name: Lint with isort
+      - name: Format with ruff
         if: ${{ always() }}
-        run: isort --check-only --profile black src tests
+        run: ruff format . --check
 
-      - name: Lint with black
+      - name: Lint with ruff
         if: ${{ always() }}
-        run: black --check src tests
-
-      - name: Lint with flake8
-        if: ${{ always() }}
-        run: flake8 src tests
+        run: ruff check .
 
       - name: Check typing with mypy
         if: ${{ always() }}

{subscript-1.2.2 → subscript-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.2.2
+Version: 1.4.0
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -692,6 +692,7 @@ Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Natural Language :: English
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Requires-Python: >=3.8
@@ -712,13 +713,9 @@ Requires-Dist: scipy
 Requires-Dist: seaborn
 Requires-Dist: segyio
 Requires-Dist: shapely
-Requires-Dist: urllib3<2
 Requires-Dist: xlrd
 Requires-Dist: xtgeo
 Provides-Extra: tests
-Requires-Dist: black; extra == "tests"
-Requires-Dist: flake8; extra == "tests"
-Requires-Dist: isort; extra == "tests"
 Requires-Dist: mypy; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
@@ -726,6 +723,7 @@ Requires-Dist: pytest-mock; 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"
@@ -742,9 +740,9 @@ Requires-Dist: sphinx_rtd_theme; extra == "docs"
 
 [![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.8%20|%203.9%20|%203.10-blue.svg)
+![Python Version](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11-blue.svg)
 [![License: GPL v3](https://img.shields.io/github/license/equinor/subscript)](https://www.gnu.org/licenses/gpl-3.0)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![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.
 

{subscript-1.2.2 → subscript-1.4.0}/README.md

@@ -2,9 +2,9 @@
 
 [![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.8%20|%203.9%20|%203.10-blue.svg)
+![Python Version](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11-blue.svg)
 [![License: GPL v3](https://img.shields.io/github/license/equinor/subscript)](https://www.gnu.org/licenses/gpl-3.0)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![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.
 

subscript-1.4.0/ci/testkomodo.sh

@@ -0,0 +1,34 @@
+install_test_dependencies () {
+    pip install ".[tests,docs]"
+}
+
+copy_test_files () {
+    cp -r $CI_SOURCE_ROOT/tests $CI_TEST_ROOT/tests
+    cp $CI_SOURCE_ROOT/pyproject.toml $CI_TEST_ROOT
+}
+
+get_os_arch () {
+    uname_info=$(uname -a)
+
+    rhel7=$(echo "$uname_info" | grep "el7")
+    rhel8=$(echo "$uname_info" | grep "el8")
+
+    os_arch="undetermined"
+
+    if [ "$rhel7" ]; then
+        os_arch="x86_64_RH_7"
+    elif [ "$rhel8" ]; then
+        os_arch="x86_64_RH_8"
+    else
+        echo "$os_arch"
+        exit 1
+    fi
+
+    echo "$os_arch"
+    exit 0
+}
+
+start_tests () {
+    os_arch="$(get_os_arch)"
+    pytest -n auto --flow-simulator="/project/res/$os_arch/bin/flowdaily" --eclipse-simulator="runeclipse"
+}

{subscript-1.2.2 → subscript-1.4.0}/docs/contributing.rst

@@ -58,8 +58,11 @@ running tests that rely upon a black oil simulation.
 
 .. code-block:: console
 
+  # running on redhat 7
   pytest -n auto --flow-simulator="/project/res/x86_64_RH_7/bin/flowdaily" --eclipse-simulator="runeclipse"
 
+  # running on redhat 8
+  pytest -n auto --flow-simulator="/project/res/x86_64_RH_8/bin/flowdaily" --eclipse-simulator="runeclipse"
 
 Code style
 ----------
@@ -69,9 +72,8 @@ the linting done in CI:
 
  .. code-block:: console
 
-  isort --check-only --profile black src tests
-  black --check *.py src tests
-  flake8 src tests
+  ruff . 
+  ruff format .
   mypy src/subscript
   rstcheck -r docs
 

{subscript-1.2.2 → subscript-1.4.0}/pyproject.toml

@@ -30,6 +30,7 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Natural Language :: English",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
 ]
@@ -50,16 +51,12 @@ dependencies = [
     "seaborn",
     "segyio",
     "shapely",
-    "urllib3<2",
     "xlrd",
     "xtgeo",
 ]
 
 [project.optional-dependencies]
 tests = [
-    "black",
-    "flake8",
-    "isort",
     "mypy",
     "pytest",
     "pytest-cov",
@@ -67,6 +64,7 @@ tests = [
     "pytest-xdist",
     "rstcheck",
     "rstcheck-core",
+    "ruff",
     "types-Jinja2",
     "types-PyYAML",
     "types-python-dateutil",
@@ -134,12 +132,6 @@ script-files = [
     "src/subscript/legacy/runeclipse",
 ]
 
-[tool.black]
-line-length = 88
-
-[tool.isort]
-profile = "black"
-
 [tool.mypy]
 ignore_missing_imports = true
 
@@ -166,3 +158,24 @@ markers = [
 
 [tool.rstcheck]
 ignore_directives = ["argparse", "automodule"]
+
+[tool.ruff]
+lint.ignore = [
+    "C901",
+]
+lint.select = [
+    "C",
+    "E",
+    "F",
+    "I",
+    "PIE",
+    "Q",
+    "RET",
+    "RSE",
+    "SIM",
+    "W",
+]
+line-length = 88
+
+[tool.ruff.lint.isort]
+combine-as-imports = true

{subscript-1.2.2 → subscript-1.4.0}/src/subscript/__init__.py

@@ -1,5 +1,6 @@
 import logging
 import sys
+from pathlib import Path
 
 try:
     from importlib import metadata
@@ -9,6 +10,21 @@ 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
+
+
 def getLogger(module_name="subscript"):
     # pylint: disable=invalid-name
     """Provides a unified logger for subscript scripts.

{subscript-1.2.2 → subscript-1.4.0}/src/subscript/bjobsusers/bjobsusers.py

@@ -65,9 +65,7 @@ def get_jobs(status: str, bjobs_function: Callable) -> pd.DataFrame:
     data = [
         [
             uname,
-            1
-            if rex.match(hname) is None
-            else int(rex.match(hname).group(1)),  # type: ignore
+            1 if rex.match(hname) is None else int(rex.match(hname).group(1)),  # type: ignore
         ]
         for (uname, hname) in slines
     ]

{subscript-1.2.2 → subscript-1.4.0}/src/subscript/casegen_upcars/casegen_upcars.py

@@ -549,9 +549,8 @@ def main():
     built_in_functions = ["range"]
 
     for var in sorted(meta.find_undeclared_variables(ast)):
-        if dictionary.get(var) is None:
-            if var not in built_in_functions:
-                undefined_var.append(var)
+        if dictionary.get(var) is None and var not in built_in_functions:
+            undefined_var.append(var)
 
     if undefined_var:
         logger.warning(

{subscript-1.2.2 → subscript-1.4.0}/src/subscript/casegen_upcars/model.py

@@ -1,4 +1,4 @@
-""" Engine part of casegen_upcars """
+"""Engine part of casegen_upcars"""
 
 import datetime
 import io
@@ -435,9 +435,7 @@ 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
@@ -470,9 +468,9 @@ Initializing model
         if self._a * self._b * self._c == 0.0:
             self.dict_info["ModelDescription"] = f"Slab with tilting angle {self._tilt}"
         else:
-            self.dict_info[
-                "ModelDescription"
-            ] = "Dome structure with radius (x, y, z) : {:.2f}m, {:.2f}m, {:.2f}m"
+            self.dict_info["ModelDescription"] = (
+                "Dome structure with radius (x, y, z) : {:.2f}m, {:.2f}m, {:.2f}m"
+            )
 
         x_mid = self._centroid_x * self._lx
         y_mid = self._centroid_y * self._ly
@@ -494,13 +492,13 @@ Initializing model
         cell_dz = np.empty((self._total_nx, self._total_ny, self._total_nz))
 
         for idx in self._fracture_i:
-            cell_dx[
-                idx : idx + self._fracture_cell_count, :, :
-            ] = self._fracture_thickness
+            cell_dx[idx : idx + self._fracture_cell_count, :, :] = (
+                self._fracture_thickness
+            )
         for idx in self._fracture_j:
-            cell_dy[
-                :, idx : idx + self._fracture_cell_count, :
-            ] = self._fracture_thickness
+            cell_dy[:, idx : idx + self._fracture_cell_count, :] = (
+                self._fracture_thickness
+            )
         for idx in range(self._nz):
             cell_dz[:, :, idx] = self._layer_dz[idx]
         self._cell_volume = cell_dx * cell_dy * cell_dz
@@ -608,10 +606,7 @@ Initializing model
         assert len(streak_property) == len(
             self._streak_k
         ), f"Number of input {keyword} is not equal to number of streak"
-        if isinstance(fracture_property, int):
-            data_type = np.int16
-        else:
-            data_type = float
+        data_type = np.int16 if isinstance(fracture_property, int) else float
         props = np.empty(
             (self._total_nx, self._total_ny, self._total_nz), dtype=data_type
         )
@@ -653,10 +648,7 @@ Initializing model
             + keyword
             + " is not equal to number fault in Y- direction"
         )
-        if isinstance(fracture_x_property, int):
-            data_type = np.int16
-        else:
-            data_type = float
+        data_type = np.int16 if isinstance(fracture_x_property, int) else float
         props = np.empty(
             (self._total_nx, self._total_ny, self._total_nz), dtype=data_type
         )
@@ -779,9 +771,9 @@ Initializing model
         )
 
         for idx in range(1, self._total_nz):
-            zcorn[
-                n_surface_points * 2 * idx : n_surface_points * (2 * idx + 1)
-            ] = zcorn[n_surface_points * (2 * idx - 1) : n_surface_points * (2 * idx)]
+            zcorn[n_surface_points * 2 * idx : n_surface_points * (2 * idx + 1)] = (
+                zcorn[n_surface_points * (2 * idx - 1) : n_surface_points * (2 * idx)]
+            )
             zcorn[
                 n_surface_points * (2 * idx + 1) : 2 * n_surface_points * (idx + 1)
             ] = (
@@ -810,8 +802,8 @@ Initializing model
         print("/", file=buffer_)
 
         print("COORD", file=buffer_)
-        for _i in range(0, self._xv.shape[0]):
-            for _j in range(0, self._xv.shape[1]):
+        for _i in range(self._xv.shape[0]):
+            for _j in range(self._xv.shape[1]):
                 print(
                     # pylint: disable=consider-using-f-string
                     "{{x:{0}}} {{y:{0}}} {{z:{0}}} "
@@ -958,7 +950,7 @@ Initializing model
                         low=near_fracture_vug_fraction_dist[0],
                         high=near_fracture_vug_fraction_dist[1],
                         size=1,
-                    )
+                    )[0]
                     * self._total_matrix_cells
                 )
             )
@@ -1028,7 +1020,7 @@ Initializing model
                         low=near_streak_vug_fraction_dist[0],
                         high=near_streak_vug_fraction_dist[1],
                         size=1,
-                    )
+                    )[0]
                     * self._total_matrix_cells
                 )
             )
@@ -1085,7 +1077,7 @@ Initializing model
                         low=random_vug_fraction_dist[0],
                         high=random_vug_fraction_dist[1],
                         size=1,
-                    )
+                    )[0]
                     * self._total_matrix_cells
                 )
             )

{subscript-1.2.2 → subscript-1.4.0}/src/subscript/casegen_upcars/udf.py

@@ -1,4 +1,5 @@
-""" Supporting functions/class for casegen_upcars """
+"""Supporting functions/class for casegen_upcars"""
+
 import numpy as np
 from scipy.stats import uniform
 

{subscript-1.2.2 → subscript-1.4.0}/src/subscript/casegen_upcars/udf_arg_parser.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-""" Argument parser for casegen_upcars """
+"""Argument parser for casegen_upcars"""
 
 from subscript import __version__
 

{subscript-1.2.2 → subscript-1.4.0}/src/subscript/check_swatinit/check_swatinit.py

@@ -1,4 +1,5 @@
 """SWATINIT qc tool"""
+
 import argparse
 import sys
 from typing import Any, Dict, List
@@ -323,10 +324,7 @@ def qc_flag(qc_frame: pd.DataFrame) -> pd.DataFrame:
 
     qc_col = pd.Series(index=qc_frame.index, dtype=str)
 
-    if "OWC" in qc_frame:
-        contact = "OWC"
-    else:
-        contact = "GWC"
+    contact = "OWC" if "OWC" in qc_frame else "GWC"
 
     # Eclipse and libecl does not calculate cell centres to the same decimals.
     # Add some tolerance when testing towards fluid contacts.
@@ -356,9 +354,9 @@ def qc_flag(qc_frame: pd.DataFrame) -> pd.DataFrame:
     # Below a nonzero capillary entry pressure but above the contact,
     # SWAT and SWATINIT should be 1.
     if "PPCW" in qc_frame:
-        qc_col[
-            np.isclose(qc_frame["SWAT"], 1) & np.isclose(qc_frame["PPCW"], 0)
-        ] = __PC_SCALED__
+        qc_col[np.isclose(qc_frame["SWAT"], 1) & np.isclose(qc_frame["PPCW"], 0)] = (
+            __PC_SCALED__
+        )
 
     # PC is scaled (including "scaling" using PC_SCALING=1), but
     # SWAT!=SWATINIT, this must be due to EQUIL item 9 being nonzero.
@@ -553,10 +551,7 @@ def compute_pc(qc_frame: pd.DataFrame, satfunc_df: pd.DataFrame) -> pd.Series:
             swls = satnum_frame["SWL"].values
         else:
             swls = None
-        if "SWU" in satnum_frame:
-            swus = satnum_frame["SWU"].values
-        else:
-            swus = None
+        swus = satnum_frame["SWU"].values if "SWU" in satnum_frame else None
         p_cap[satnum_frame.index] = _evaluate_pc(
             satnum_frame["SWAT"].values,
             satnum_frame["PC_SCALING"].values,
@@ -565,10 +560,7 @@ def compute_pc(qc_frame: pd.DataFrame, satfunc_df: pd.DataFrame) -> pd.Series:
             satfunc_df[satfunc_df["SATNUM"] == satnum],
         )
     # Fix needed for OPM-flow above contact:
-    if "OWC" in qc_frame:
-        contact = "OWC"
-    else:
-        contact = "GWC"
+    contact = "OWC" if "OWC" in qc_frame else "GWC"
 
     # When SWATINIT=SWL=SWAT, PPCW as reported by Eclipse is the
     # same as PCOW_MAX, and we cannot use it to compute PC, remove it:
@@ -618,7 +610,7 @@ def merge_equil(grid_df: pd.DataFrame, equil_df: pd.DataFrame) -> pd.DataFrame:
     # Be compatible with future change in res2df:
     equil_df.rename({"ACCURACY": "OIP_INIT"}, axis="columns", inplace=True)
 
-    contacts = list(set(["OWC", "GOC", "GWC"]).intersection(set(equil_df.columns)))
+    contacts = list({"OWC", "GOC", "GWC"}.intersection(set(equil_df.columns)))
     # Rename and slice the equil dataframe:
     equil_df = equil_df.rename(
         {"Z": "Z_DATUM", "PRESSURE": "PRESSURE_DATUM"}, axis="columns"
@@ -630,8 +622,7 @@ def merge_equil(grid_df: pd.DataFrame, equil_df: pd.DataFrame) -> pd.DataFrame:
     assert (
         not pd.isnull(equil_df).any().any()
     ), f"BUG: NaNs in equil dataframe:\n{equil_df}"
-    grid_df = grid_df.merge(equil_df, on="EQLNUM", how="left")
-    return grid_df
+    return grid_df.merge(equil_df, on="EQLNUM", how="left")
 
 
 def merge_pc_max(

{subscript-1.2.2 → subscript-1.4.0}/src/subscript/convert_grid_format/convert_grid_format.py

@@ -1,6 +1,7 @@
 """Conversion between grid corner point formats"""
 
 import argparse
+import logging
 import os
 import sys
 from pathlib import Path
@@ -18,7 +19,9 @@ CONVERSIONS = ["ecl2roff"]
 MODES = ["grid", "init", "restart"]
 
 xtg = XTGeoDialog()
-logger = xtg.functionlogger(__name__)
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
 
 
 def get_parser() -> argparse.ArgumentParser:
@@ -147,10 +150,7 @@ def _convert_ecl2roff(
         if not props:
             raise SystemExit("STOP. No properties given")
 
-        if ":" in props:
-            props_list = props.split(":")
-        else:
-            props_list = props.split()
+        props_list = props.split(":") if ":" in props else props.split()
 
         fformat = mode
         fformat = fformat.replace("restart", "unrst")
@@ -162,10 +162,7 @@ def _convert_ecl2roff(
 
             if os.path.exists(dates):
                 dates = " ".join(Path(dates).read_text(encoding="utf8").splitlines())
-            if ":" in dates:
-                dates_list = dates.split(":")
-            else:
-                dates_list = dates.split()
+            dates_list = dates.split(":") if ":" in dates else dates.split()
         else:
             dates_list = None
 
@@ -198,8 +195,9 @@ def main(args=None) -> None:
     logger.info(args)
 
     if args.conversion not in set(CONVERSIONS):
-        logger.critical("ERROR")
-        SystemExit("Illegal conversion <{args.conversion}>. Allowed are: {CONVERSIONS}")
+        raise ValueError(
+            f"Illegal conversion <{args.conversion}>. Allowed are: {CONVERSIONS}"
+        )
 
     xtg.say("Running conversion...")
     _convert_ecl2roff(

{subscript-1.2.2 → subscript-1.4.0}/src/subscript/csv2ofmvol/csv2ofmvol.py

@@ -7,8 +7,7 @@ from typing import List, Union
 import pandas as pd
 from dateutil.relativedelta import relativedelta
 
-from subscript import __version__
-from subscript import getLogger as subscriptlogger
+from subscript import __version__, getLogger as subscriptlogger
 from subscript.eclcompress.eclcompress import glob_patterns
 
 logger = subscriptlogger(__name__)
@@ -71,7 +70,7 @@ SUPPORTED_COLS = SUPPORTED_VOLCOLS + SUPPORTED_DAYCOLS
 
 
 def read_pdm_csv_files(
-    csvfiles: Union[pd.DataFrame, str, List[str], List[pd.DataFrame]]
+    csvfiles: Union[pd.DataFrame, str, List[str], List[pd.DataFrame]],
 ) -> pd.DataFrame:
     """Read a list of CSV files and return a dataframe
 
@@ -250,8 +249,6 @@ class CustomFormatter(
 
     # pylint: disable=unnecessary-pass
 
-    pass
-
 
 def get_parser() -> argparse.ArgumentParser:
     """Parse command line arguments, return a Namespace with arguments"""

{subscript-1.2.2 → subscript-1.4.0}/src/subscript/csv_merge/csv_merge.py

@@ -8,7 +8,7 @@ import sys
 from typing import Dict, List, Optional
 
 import pandas as pd
-from ert import ErtScript
+from ert.config import ErtScript
 from ert.shared.plugins.plugin_manager import hook_implementation  # type: ignore
 
 from subscript import __version__, getLogger
@@ -54,7 +54,6 @@ class CustomFormatter(
     """
 
     # pylint: disable=unnecessary-pass
-    pass
 
 
 class CsvMerge(ErtScript):
@@ -243,7 +242,7 @@ def taglist(strings: List[str], regexp_str: str) -> list:
     list is returned.
     """
     regexp = re.compile(regexp_str)
-    matches = map(lambda x: re.match(regexp, x), strings)
+    matches = (re.match(regexp, x) for x in strings)
     values = [x and x.group(1) for x in matches]
     if any(values):
         return values