res2df 1.3.0__tar.gz → 1.3.1__tar.gz

{res2df-1.3.0 → res2df-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: res2df
-Version: 1.3.0
+Version: 1.3.1
 Summary: Convert reservoir simulator input and output to DataFrames
 Home-page: http://github.com/equinor/res2df
 Author: Håvard Berland

res2df-1.3.1/ci/testkomodo.sh

@@ -0,0 +1,13 @@
+install_test_dependencies () {
+  pip install -r test_requirements.txt
+}
+
+start_tests () {
+  SHELLOPTS_BEFORE=$(set +o)
+  set +e
+  # (this script becomes flaky if set -e is active)
+  source /prog/res/ecl/script/eclrun.bash
+  eval "$SHELLOPTS_BEFORE"
+
+  pytest --run-eclipse-simulator
+}

{res2df-1.3.0 → res2df-1.3.1}/res2df/pvt.py

@@ -375,7 +375,7 @@ def df2res_rock(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
         return "-- No data!"
     string = "ROCK\n"
     string += comment_formatter(comment)
-    string += "--   {'PRESSURE':^21} {'COMPRESSIBILITY':^21}\n"
+    string += f"--   {'PRESSURE':^21} {'COMPRESSIBILITY':^21}\n"
     # Use everything if KEYWORD not in dframe..
     subset = dframe if "KEYWORD" not in dframe else dframe[dframe["KEYWORD"] == "ROCK"]
     if "PVTNUM" not in subset:

{res2df-1.3.0 → res2df-1.3.1}/res2df/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.3.1'
+__version_tuple__ = version_tuple = (1, 3, 1)

{res2df-1.3.0 → res2df-1.3.1}/res2df.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: res2df
-Version: 1.3.0
+Version: 1.3.1
 Summary: Convert reservoir simulator input and output to DataFrames
 Home-page: http://github.com/equinor/res2df
 Author: Håvard Berland

{res2df-1.3.0 → res2df-1.3.1}/tests/test_summary_restarts.py

@@ -2,6 +2,7 @@ import os
 import subprocess
 import time
 from contextlib import nullcontext as does_not_raise
+from contextlib import suppress
 from pathlib import Path
 
 import pytest
@@ -121,15 +122,23 @@ def test_summary_restarts(
 
 
 def run_reservoir_simulator(eclipse_version: str, datafile: str) -> None:
-    command = ["runeclipse", "-i", "-v", eclipse_version, datafile]
+    command = ["eclrun", "eclipse", "-v", eclipse_version, datafile]
     result = subprocess.run(  # pylint: disable=subprocess-run-check
         command,
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
-        check=False,
+        check=False,  # eclrun returns code 0 no matter what error happens
     )
     aggregated_output = result.stdout.decode() + result.stderr.decode()
-    if result.returncode != 0 and (
+
+    error_count = 0
+    for line in aggregated_output.splitlines():
+        if line.startswith(" Errors"):
+            with suppress(ValueError):
+                error_count = int(line.split("Errors")[1].strip())
+    proxied_returncode = 1 if error_count > 0 else 0
+
+    if proxied_returncode != 0 and (
         "LICENSE FAILURE" in aggregated_output or "LICENSE ERROR" in aggregated_output
     ):
         print("Eclipse failed due to license server issues. Retrying in 30 seconds.")
@@ -141,7 +150,7 @@ def run_reservoir_simulator(eclipse_version: str, datafile: str) -> None:
             check=False,
         )
 
-    if result.returncode != 0:
+    if proxied_returncode != 0:
         if result.stdout:
             print(result.stdout.decode())
         if result.stderr:

res2df-1.3.0/ci/testkomodo.sh

@@ -1,7 +0,0 @@
-install_test_dependencies () {
-  pip install -r test_requirements.txt
-}
-
-start_tests () {
-  pytest --run-eclipse-simulator
-}