subscript 1.3.0__tar.gz → 1.4.0__tar.gz

{subscript-1.3.0 → 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.3.0 → 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.3.0 → subscript-1.4.0}/.github/workflows/subscript.yml

@@ -26,12 +26,12 @@ jobs:
 
     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 }}
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.3.0
+Version: 1.4.0
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -713,7 +713,6 @@ 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

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

@@ -51,7 +51,6 @@ dependencies = [
     "seaborn",
     "segyio",
     "shapely",
-    "urllib3<2",
     "xlrd",
     "xtgeo",
 ]

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

@@ -950,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
                 )
             )
@@ -1020,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
                 )
             )
@@ -1077,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.3.0 → subscript-1.4.0}/src/subscript/csv_stack/csv_stack.py

@@ -319,7 +319,7 @@ def csv_stack(
         # the rows that emerged from the stacking. If you use the
         # 'all' pivottype, then you will get some NaN-values in the
         # MultiIndex columns that are intentional.
-        dframe[nostackcolumnnames] = dframe[nostackcolumnnames].fillna(method="ffill")
+        dframe[nostackcolumnnames] = dframe[nostackcolumnnames].ffill()
 
         dframe = dframe.reset_index()
 

{subscript-1.3.0 → subscript-1.4.0}/src/subscript/fmuobs/writers.py

@@ -291,10 +291,13 @@ def convert_dframe_date_to_str(dframe: pd.DataFrame) -> pd.DataFrame:
     """
     if "DATE" in dframe:
         dframe = dframe.copy()
-        dframe["DATE"] = dframe["DATE"].astype(str)
-        dframe["DATE"].replace("NaT", np.nan, inplace=True)
-        dframe["DATE"].replace("NaN", np.nan, inplace=True)
-        dframe["DATE"].replace("nan", np.nan, inplace=True)
+        dframe["DATE"] = (
+            dframe["DATE"]
+            .astype(str)
+            .replace(["NaT", "NaN", "nan"], np.nan)
+            .infer_objects()
+        )
+
     return dframe
 
 

{subscript-1.3.0 → subscript-1.4.0}/src/subscript/interp_relperm/interp_relperm.py

@@ -186,7 +186,7 @@ def make_wateroilgas(dframe: pd.DataFrame, delta_s: float) -> pyscal.WaterOilGas
             .sort_index()
             .dropna(how="all")
             .interpolate(method="index")
-            .fillna(method="bfill")
+            .bfill()
             .round(8)
             .drop_duplicates()
             .reset_index()
@@ -197,7 +197,7 @@ def make_wateroilgas(dframe: pd.DataFrame, delta_s: float) -> pyscal.WaterOilGas
             .sort_index()
             .dropna(how="all")
             .interpolate(method="index")
-            .fillna(method="bfill")
+            .bfill()
             .round(8)
             .drop_duplicates()
             .reset_index()

{subscript-1.3.0 → subscript-1.4.0}/src/subscript/params2csv/params2csv.py

@@ -4,11 +4,13 @@ data, ensuring labels for each value matches).
 
 """
 
+from __future__ import annotations
+
 import argparse
 import logging
-import re
 import shutil
 from glob import glob
+from pathlib import Path
 
 import pandas as pd
 from ert.config import ErtScript
@@ -27,7 +29,7 @@ parameters.txt is a text file with <key> <value> on each line
 In the CSV file, each individual parameter file will be represented by one data row.
 The order of parameters in each text file is not conserved.
 
-The original filename for each file is written to the column ‘filename’.
+The original filename for each file is written to the column 'filename'.
 Beware if you have that as a <key> in the text files.
 """
 
@@ -55,15 +57,31 @@ The `filename` column can be renamed by adding an argument <FILENAMECOLUMN> to t
 # The following string is used for the ERT workflow documentation, note
 # the very subtle difference in variable name.
 WORKFLOW_EXAMPLE = """
-Add a file named e.g. ``ert/bin/workflows/PARAMS2CSV_ITER0`` with the contents::
+Add a file named e.g. ``ert/bin/workflows/wf_params2csv_iter0`` with the contents::
+
   MAKE_DIRECTORY <SCRATCH>/<USER>/<CASE_DIR>/share/results/tables
   PARAMS2CSV "--verbose" "-o" <SCRATCH>/<USER>/<CASE_DIR>/share/results/tables/parameters_iter-0.csv <SCRATCH>/<USER>/<CASE_DIR>/realization-*/iter-0/parameters.txt
 
 Add to your ERT config to have the workflow loaded upon launching::
 
-  LOAD_WORKFLOW ../bin/workflows/PARAMS2CSV_ITER0
+  LOAD_WORKFLOW ../bin/workflows/wf_params2csv_iter0
+
+It is then possible to run the workflow either through ERT CLI or GUI. 
+
+Wildcards can be used to extract parameters from multiple iterations,
+this is done in the example below. Note also the use of ``HOOK_WORKFLOW`` to automatically
+run the workflow when all realizations have finished.
+
+Add a file named e.g. ``ert/bin/workflows/wf_params2csv_hist`` with the contents::
+
+  MAKE_DIRECTORY <SCRATCH>/<USER>/<CASE_DIR>/share/results/tables
+  PARAMS2CSV "--verbose" "-o" <SCRATCH>/<USER>/<CASE_DIR>/share/results/tables/parameters_hist.csv <SCRATCH>/<USER>/<CASE_DIR>/realization-*/iter-*/parameters.txt
+
+Add to your ERT config to have the workflow automatically executed on successful runs::
+
+  LOAD_WORKFLOW ../bin/workflows/wf_params2csv_hist
+  HOOK_WORKFLOW wf_params2csv_hist POST_SIMULATION
 
-It is then possible to run the workflow either through ERT CLI or GUI.
 """  # noqa
 
 
@@ -153,26 +171,33 @@ def params2csv_main(args: argparse.Namespace) -> None:
     if args.verbose:
         logger.setLevel(logging.INFO)
 
-    # Expand wildcards if not being expanded
-    args.parameterfile = [
-        path for pattern in args.parameterfile for path in sorted(glob(pattern))
+    possible_metadata_columns = [
+        "ENSEMBLESET",
+        "REAL",
+        "ENSEMBLE",
+        "ITER",
+        args.filenamecolumnname,
     ]
 
-    ens = pd.DataFrame()
+    # Expand wildcards if not being expanded
+    paramfile_paths = [
+        Path(path) for pattern in args.parameterfile for path in sorted(glob(pattern))
+    ]
 
-    parsedfiles = 0
-    for _, parameterfilename in enumerate(args.parameterfile, start=0):
-        try:
-            paramtable = pd.read_csv(parameterfilename, header=None, sep=r"\s+")
-            parsedfiles = parsedfiles + 1
-        except IOError:
+    dfs = []
+    for parameterfilename in paramfile_paths:
+        if not parameterfilename.exists():
             logger.warning("%s not found, skipping..", parameterfilename)
             continue
 
-        # Chop to only two colums, set keys, and transpose, and then
-        # merge with the previous tables
-        paramtable = pd.DataFrame(paramtable.iloc[:, 0:2])
-        paramtable.columns = ["key", "value"]
+        paramtable = pd.read_csv(
+            parameterfilename,
+            names=["key", "value"],
+            header=None,
+            usecols=[0, 1],
+            sep=r"\s+",
+        )
+
         paramtable.drop_duplicates(
             "key", keep="last", inplace=True
         )  # if key is repeated, keep the last one.
@@ -185,28 +210,28 @@ def params2csv_main(args: argparse.Namespace) -> None:
                 parameterfilename,
             )
         else:
-            transposed.insert(0, args.filenamecolumnname, parameterfilename)
-
-        # Look for meta-information in filename
-        realregex = r".*realization-(\d*)/"
-        iterregex = r".*iter-(\d*)/"
-        if (
-            re.match(realregex, parameterfilename)
-            and "Realization" not in transposed.columns
-        ):
-            transposed.insert(
-                0,
-                "Realization",
-                re.match(realregex, parameterfilename).group(1),  # type: ignore
-            )
-        if re.match(iterregex, parameterfilename) and "Iter" not in transposed.columns:
-            transposed.insert(
-                0,
-                "Iter",
-                re.match(iterregex, parameterfilename).group(1),  # type: ignore
-            )
+            transposed[args.filenamecolumnname] = str(parameterfilename)
+
+        path_metadata = get_metadata_from_path(parameterfilename.resolve())
+        if path_metadata is not None:
+            case_folder, iter_folder, iteration, real = path_metadata
+            transposed["ENSEMBLESET"] = case_folder
+            transposed["ENSEMBLE"] = iter_folder
+            transposed["ITER"] = iteration
+            transposed["REAL"] = real
+        dfs.append(transposed)
+
+    if not dfs:
+        raise ValueError("No parameterfiles was found, check the input path provided")
+    ens = pd.concat(dfs)
+
+    metadata_columns = [col for col in possible_metadata_columns if col in ens]
+    parameter_columns = [col for col in ens.columns if col not in metadata_columns]
 
-        ens = pd.concat([ens, transposed], sort=True)
+    # reorder dataframe and sort by ensemble and realization if present
+    ens = ens[metadata_columns + parameter_columns]
+    if "REAL" in metadata_columns:
+        ens = ens.sort_values(["ENSEMBLE", "REAL"])
 
     if args.clean:
         # Users wants the script to write back to parameters.txt a
@@ -214,23 +239,21 @@ def params2csv_main(args: argparse.Namespace) -> None:
         # parameters is equal in an entire ensemble, and so that
         # duplicate keys are removed Parameters only existing in some
         # realizations will be NaN-padded in the others.
-        ensfilenames = ens.reset_index()["filename"]
-        ensidx = ens.reset_index().drop(["index", "filename"], axis=1)
-        for row in list(ensidx.index.values):
-            paramfile = ensfilenames.loc[row]
+        for paramfile, realdf in ens.groupby(args.filenamecolumnname):
             shutil.copyfile(paramfile, paramfile + ".backup")
             logger.info("Writing to %s", paramfile)
-            ensidx.loc[row].to_csv(paramfile, sep=" ", na_rep="NaN", header=False)
+            realdf = realdf[parameter_columns].transpose()
+            realdf.to_csv(paramfile, sep=" ", na_rep="NaN", header=False)
 
     # Drop constant columns:
     if not args.keepconstantcolumns:
-        for col in ens.columns:
+        for col in parameter_columns:
             if len(ens[col].unique()) == 1:
                 del ens[col]
                 logger.warning("Dropping constant column %s", col)
 
     ens.to_csv(args.output, index=False)
-    logger.info("%s parameterfiles written to %s", parsedfiles, args.output)
+    logger.info("%s parameterfiles written to %s", len(dfs), args.output)
 
 
 def main() -> None:
@@ -251,5 +274,33 @@ def legacy_ertscript_workflow(config) -> None:
     workflow.category = CATEGORY
 
 
+def get_metadata_from_path(paramfile: Path) -> tuple[str, str, int, int] | None:
+    """Get some metadata from the Path object"""
+
+    real_path = get_realization_path(paramfile)
+    if not real_path:
+        return None
+
+    real = get_number_from_folder(real_path.stem)
+    case_folder = real_path.parent.stem
+
+    # if real folder is direct parent to runpath, there is no iter
+    iter_folder = paramfile.parent.stem if real_path != paramfile.parent else "iter-0"
+    iteration = (
+        get_number_from_folder(iter_folder) if iter_folder.startswith("iter-") else 0
+    )
+    return case_folder, iter_folder, iteration, real
+
+
+def get_realization_path(path: Path) -> Path | None:
+    """Retrive the realization path, return None if not found"""
+    return next((p for p in path.parents if p.stem.startswith("realization-")), None)
+
+
+def get_number_from_folder(foldername: str) -> int:
+    """Retrive the integer after the '-' from the folder name"""
+    return int(foldername.split("-")[-1])
+
+
 if __name__ == "__main__":
     main()

{subscript-1.3.0 → subscript-1.4.0}/src/subscript/presentvalue/presentvalue.py

@@ -369,13 +369,13 @@ def calc_presentvalue_df(
     prodecon = pd.concat([summary_df, econ_df], axis=1, sort=True)
     prodecon[["oilprice", "gasprice", "usdtonok", "discountrate"]] = prodecon[
         ["oilprice", "gasprice", "usdtonok", "discountrate"]
-    ].fillna(method="ffill")
+    ].ffill()
     # Avoid ffilling costs...
     # There could be situations where we need to bfill prices as well,
     # if the user provided a econtable
     prodecon[["oilprice", "gasprice", "usdtonok", "discountrate"]] = prodecon[
         ["oilprice", "gasprice", "usdtonok", "discountrate"]
-    ].fillna(method="bfill")
+    ].bfill()
     prodecon.fillna(value=0, inplace=True)  # Zero-pad other data (costs)
 
     prodecon["deltayears"] = prodecon.index - discountto

{subscript-1.3.0 → subscript-1.4.0}/src/subscript/prtvol2csv/prtvol2csv.py

@@ -323,7 +323,11 @@ def prtvol2df(
     and add REGION and ZONE parameter.
     """
     # Concatenate dataframes horizontally. Both are/must be indexed by FIPNUM:
-    volumes = pd.concat([simvolumes_df, resvolumes_df], axis=1).fillna(value=0.0)
+    volumes = (
+        pd.concat([simvolumes_df, resvolumes_df], axis=1)
+        .apply(pd.to_numeric)
+        .fillna(value=0.0)
+    )
 
     if fipmapper is not None:
         if fipmapper.has_fip2region:

{subscript-1.3.0 → subscript-1.4.0}/src/subscript/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.3.0'
-__version_tuple__ = version_tuple = (1, 3, 0)
+__version__ = version = '1.4.0'
+__version_tuple__ = version_tuple = (1, 4, 0)

{subscript-1.3.0 → subscript-1.4.0}/src/subscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.3.0
+Version: 1.4.0
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -713,7 +713,6 @@ 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

{subscript-1.3.0 → subscript-1.4.0}/src/subscript.egg-info/requires.txt

@@ -13,7 +13,6 @@ scipy
 seaborn
 segyio
 shapely
-urllib3<2
 xlrd
 xtgeo
 

{subscript-1.3.0 → subscript-1.4.0}/tests/test_params2csv.py

@@ -15,6 +15,15 @@ except ImportError:
     HAVE_ERT = False
 
 
+ERT_CONFIG_WF = [
+    "QUEUE_SYSTEM LOCAL",
+    "NUM_REALIZATIONS 1",
+    "RUNPATH <CONFIG_PATH>",
+    "",
+    "LOAD_WORKFLOW wf_params2csv",
+]
+
+
 def test_main(tmp_path, mocker):
     """Test invocation from command line"""
     os.chdir(tmp_path)
@@ -165,7 +174,7 @@ def test_ert_workflow(tmp_path):
             f"real\t{i}", encoding="utf8"
         )
 
-    Path("PARAMS2CSV_ITER0").write_text(
+    Path("wf_params2csv").write_text(
         (
             'PARAMS2CSV "-o" <CONFIG_PATH>/parameters.csv '
             "<CONFIG_PATH>/realization-*/iter-0/parameters.txt"
@@ -173,20 +182,116 @@ def test_ert_workflow(tmp_path):
     )
 
     ert_config_fname = "test_params2csv.ert"
-    ert_config = [
-        "QUEUE_SYSTEM LOCAL",
-        "NUM_REALIZATIONS 1",
-        "RUNPATH <CONFIG_PATH>",
-        "",
-        "LOAD_WORKFLOW PARAMS2CSV_ITER0",
-    ]
-    Path(ert_config_fname).write_text("\n".join(ert_config), encoding="utf8")
-    subprocess.run(
-        ["ert", "workflow", "PARAMS2CSV_ITER0", ert_config_fname], check=True
-    )
+    Path(ert_config_fname).write_text("\n".join(ERT_CONFIG_WF), encoding="utf8")
+    subprocess.run(["ert", "workflow", "wf_params2csv", ert_config_fname], check=True)
 
     dframe = pd.read_csv("parameters.csv")
     assert not dframe.empty
-    assert "Realization" in dframe
+    assert "REAL" in dframe
     assert "real" in dframe
     assert len(dframe.index) == realizations
+
+
+@pytest.mark.integration
+@pytest.mark.skipif(not HAVE_ERT, reason="Requires ERT to be installed")
+def test_ert_workflow_multiple_iter(tmp_path):
+    """
+    Test that PARAMS2CSV can be run as an ERT workflow/plugin on
+    multiple iterations.
+    """
+    os.chdir(tmp_path)
+
+    realizations = 3
+    for i in range(realizations):
+        Path(f"realization-{i}/iter-0").mkdir(parents=True)
+        Path(f"realization-{i}/iter-0/parameters.txt").write_text(
+            f"myparam\t{i}", encoding="utf8"
+        )
+        Path(f"realization-{i}/iter-1").mkdir(parents=True)
+        Path(f"realization-{i}/iter-1/parameters.txt").write_text(
+            f"myparam\t{i}", encoding="utf8"
+        )
+
+    Path("wf_params2csv").write_text(
+        (
+            'PARAMS2CSV "-o" <CONFIG_PATH>/parameters.csv '
+            "<CONFIG_PATH>/realization-*/iter-*/parameters.txt"
+        )
+    )
+
+    ert_config_fname = "test_params2csv.ert"
+    Path(ert_config_fname).write_text("\n".join(ERT_CONFIG_WF), encoding="utf8")
+    subprocess.run(["ert", "workflow", "wf_params2csv", ert_config_fname], check=True)
+
+    dframe = pd.read_csv("parameters.csv")
+    assert not dframe.empty
+    assert "myparam" in dframe
+    assert set(dframe["REAL"].unique()) == {0, 1, 2}
+    assert set(dframe["ENSEMBLESET"].unique()) == {tmp_path.stem}
+    assert set(dframe["ENSEMBLE"].unique()) == {"iter-0", "iter-1"}
+    assert set(dframe["ITER"].unique()) == {0, 1}
+    assert len(dframe.index) == realizations * 2
+
+
+@pytest.mark.integration
+@pytest.mark.skipif(not HAVE_ERT, reason="Requires ERT to be installed")
+def test_ert_workflow_pred_params(tmp_path):
+    """Test that PARAMS2CSV can be run on folders not starting with iter"""
+    os.chdir(tmp_path)
+
+    realizations = 3
+    for i in range(realizations):
+        Path(f"realization-{i}/pred").mkdir(parents=True)
+        Path(f"realization-{i}/pred/parameters.txt").write_text(
+            f"myparam\t{i}", encoding="utf8"
+        )
+
+    Path("wf_params2csv").write_text(
+        (
+            'PARAMS2CSV "-o" <CONFIG_PATH>/parameters.csv '
+            "<CONFIG_PATH>/realization-*/pred/parameters.txt"
+        )
+    )
+
+    ert_config_fname = "test_params2csv.ert"
+    Path(ert_config_fname).write_text("\n".join(ERT_CONFIG_WF), encoding="utf8")
+    subprocess.run(["ert", "workflow", "wf_params2csv", ert_config_fname], check=True)
+
+    dframe = pd.read_csv("parameters.csv")
+    assert not dframe.empty
+    assert "myparam" in dframe
+    assert set(dframe["REAL"].unique()) == {0, 1, 2}
+    assert set(dframe["ENSEMBLE"].unique()) == {"pred"}
+    assert set(dframe["ITER"].unique()) == {0}
+
+
+@pytest.mark.integration
+@pytest.mark.skipif(not HAVE_ERT, reason="Requires ERT to be installed")
+def test_ert_workflow_no_iter_folder(tmp_path):
+    """Test that PARAMS2CSV can be run on cases without iteration folders"""
+    os.chdir(tmp_path)
+
+    realizations = 3
+    for i in range(realizations):
+        Path(f"realization-{i}").mkdir(parents=True)
+        Path(f"realization-{i}/parameters.txt").write_text(
+            f"myparam\t{i}", encoding="utf8"
+        )
+
+    Path("wf_params2csv").write_text(
+        (
+            'PARAMS2CSV "-o" <CONFIG_PATH>/parameters.csv '
+            "<CONFIG_PATH>/realization-*/parameters.txt"
+        )
+    )
+
+    ert_config_fname = "test_params2csv.ert"
+    Path(ert_config_fname).write_text("\n".join(ERT_CONFIG_WF), encoding="utf8")
+    subprocess.run(["ert", "workflow", "wf_params2csv", ert_config_fname], check=True)
+
+    dframe = pd.read_csv("parameters.csv")
+    assert not dframe.empty
+    assert "myparam" in dframe
+    assert set(dframe["REAL"].unique()) == {0, 1, 2}
+    assert set(dframe["ENSEMBLE"].unique()) == {"iter-0"}
+    assert set(dframe["ITER"].unique()) == {0}

{subscript-1.3.0 → subscript-1.4.0}/tests/test_ri_wellmod.py

@@ -5,11 +5,9 @@ from pathlib import Path
 import pytest
 from subscript.ri_wellmod import ri_wellmod
 
-pytestmark = pytest.mark.xfail()
-
 SCRIPTNAME = "ri_wellmod"
 DATAPATH = Path(__file__).parent / "testdata_ri_wellmod"
-RI_DEV = "/project/res/x86_64_RH_7/share/resinsight/jenkins_dev/ResInsight"
+RI_DEV = "/project/res/bin/resinsightdev"
 
 try:
     # pylint: disable=unused-import
@@ -62,6 +60,14 @@ def file_contains(filename, string_to_find):
     return filetext.find(string_to_find) >= 0
 
 
+def github_online_runner():
+    gh_runner = os.getenv("GITHUB_ACTIONS") == "true"
+
+    # we still want to run tests on github actions local (komodo) runners
+    local_gh_runner = "f_scout_ci" in str(os.getenv("RUNNER_NAME"))
+    return gh_runner and not local_gh_runner
+
+
 @pytest.mark.integration
 def test_integration():
     """Test that endpoint is installed"""
@@ -85,6 +91,9 @@ def test_main_initcase(tmp_path, mocker):
     assert Path(outfile).exists() and file_contains(outfile, "A4")
 
 
+@pytest.mark.skipif(
+    github_online_runner(), reason="Cannot test on github online runner"
+)
 @pytest.mark.skipif(
     not has_resinsight(),
     reason="Could not find a ResInsight executable",
@@ -232,6 +241,9 @@ def test_ert_forward_model(tmp_path):
 
 
 # REEK TESTS
+@pytest.mark.skipif(
+    github_online_runner(), reason="Cannot test on github online runner"
+)
 @pytest.mark.skipif(
     not has_resinsight(), reason="Could not find a ResInsight executable"
 )
@@ -248,6 +260,9 @@ def test_main_initcase_reek(tmp_path, mocker):
     assert Path(outfile).exists() and file_contains(outfile, "OP_1")
 
 
+@pytest.mark.skipif(
+    github_online_runner(), reason="Cannot test on github online runner"
+)
 @pytest.mark.skipif(
     not has_resinsight(), reason="Could not find a ResInsight executable"
 )

{subscript-1.3.0 → subscript-1.4.0}/tests/test_welltest_dpds.py

@@ -70,8 +70,8 @@ def test_main(tmp_path, mocker):
     suptimew = pd.read_csv("spt.csv")
     # pylint: disable=no-member
     # (false positive)
-    assert suptimew.iloc[0][0] == pytest.approx(-9.87037983)
-    assert suptimew.iloc[-1][0] == pytest.approx(-0.65693308)
+    assert suptimew.iloc[0, 0] == pytest.approx(-9.87037983)
+    assert suptimew.iloc[-1, 0] == pytest.approx(-0.65693308)
     Path("welltest_output.csv").unlink()
 
     # test --genobs_resultfile