subscript 1.4.0__tar.gz → 1.5.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.4.0
+Version: 1.5.0
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -768,7 +768,7 @@ pip install subscript
 ## Usage
 
 As a collection of utilities subscript has many different invocations and
-usages. It is recommended to visit the
+use cases. A complete overview can be found in the
 [documentation](https://equinor.github.io/subscript)
 for a complete overview.
 

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

@@ -30,7 +30,7 @@ pip install subscript
 ## Usage
 
 As a collection of utilities subscript has many different invocations and
-usages. It is recommended to visit the
+use cases. A complete overview can be found in the
 [documentation](https://equinor.github.io/subscript)
 for a complete overview.
 

{subscript-1.4.0 → subscript-1.5.0}/docs/overview.rst

@@ -29,7 +29,6 @@ prtvol2csv                ✅   ✅                 ⛔️
 restartthinner            ✅   ⛔️                 ⛔️
 ri_wellmod                ✅   ✅                 ⛔️
 rmsecl_volumetrics        ✅   ⛔️                 ⛔️
-runrms                    ✅   ⛔️                 ⛔️
 sector2fluxnum            ✅   ⛔️                 ⛔️
 summaryplot               ✅   ⛔️                 ⛔️
 sw_model_utilities        ✅   ⛔️                 ⛔️

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

@@ -107,7 +107,6 @@ prtvol2csv = "subscript.prtvol2csv.prtvol2csv:main"
 restartthinner = "subscript.restartthinner.restartthinner:main"
 ri_wellmod = "subscript.ri_wellmod.ri_wellmod:main"
 rmsecl_volumetrics = "subscript.rmsecl_volumetrics.rmsecl_volumetrics:main"
-runrms = "subscript.runrms.runrms:main"
 sector2fluxnum = "subscript.sector2fluxnum.sector2fluxnum:main"
 summaryplot = "subscript.summaryplot.summaryplot:main"
 sw_model_utilities = "subscript.sw_model_utilities.sw_model_utilities:main"

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

@@ -11,7 +11,7 @@ from subscript import __version__
 DESCRIPTION = """
 Print list of users running on cluster, sorted by number of jobs.
 
-This is statistics derived from the system command `bjobs` and `finger`.
+This is statistics derived from the system command `bjobs` and `pinky`.
 """
 
 
@@ -77,55 +77,62 @@ def get_jobs(status: str, bjobs_function: Callable) -> pd.DataFrame:
     )
 
 
-def call_finger(username: str) -> str:
-    """Call the system utility 'finger' on a specific username
+def call_pinky(username: str) -> str:
+    """Call the system utility 'pinky' on a specific username
 
     Returns:
-        Unicode string with the first line of output from 'finger'
+        Unicode string with the first line of output from 'pinky'
         Example return value::
 
-          Login: foobert      Name: Foo Barrer (FOO BAR COM)"
+          Login name: foobert      In real life: Foo Barrer (FOO BAR COM)"
     """
-    cmd = f"finger -m {username} | head -n 1"
-    finger_output = None
+    cmd = f"pinky -l {username} | head -n 1"
+    pinky_output = None
     try:
         with open(os.devnull, "w", encoding="utf8") as devnull:
-            finger_output = (
+            pinky_output = (
                 subprocess.check_output(cmd, shell=True, stderr=devnull)
                 .strip()
                 .decode("utf-8")
             )
     except AttributeError:
         pass
-    if finger_output:
-        return finger_output
-    # When finger fails, return something similar and usable
-    return f"Login: {username}  Name: ?? ()"
+    if pinky_output:
+        return pinky_output
+    # When pinky fails, return something similar and usable
+    return f"Login name: {username}  In real life: ?? ()"
 
 
-def userinfo(username: str, finger_function: Callable) -> str:
+def userinfo(username: str, pinky_function: Callable) -> str:
     """Get information on a user based on the username
 
     Args:
         username: user shortname/loginname
-        finger_function: Function handle that can provide output
-            from the system finger program (/usr/bin/finger).
+        pinky_function: Function handle that can provide output
+            from the system pinky program (/usr/bin/pinky).
             The output must be a Unicode string
 
     Returns:
-        str: String with full user name, organization from finger output and
+        str: String with full user name, organization from pinky output and
         the shortname
     """
-    finger_output = finger_function(username)
-    rex_with_org = re.compile(r".*Login:\s+(.*)\s+Name:\s+(.*)\s+\((.*)\).*")
-    rex_no_org = re.compile(r".*Login:\s+(.*)\s+Name:\s+(.*)")
-    if rex_with_org.match(finger_output):
-        matches = rex_with_org.match(finger_output).groups()  # type: ignore
+    pinky_output = pinky_function(username)
+    rex_with_org = re.compile(
+        r".*Login name:\s+(.*)\s+In real life:\s+(.*)\s+\((.*)\).*"
+    )
+    rex_no_org = re.compile(r".*Login name:\s+(.*)\s+In real life:\s+(.*)")
+    if rex_with_org.match(pinky_output):
+        matches = rex_with_org.match(pinky_output).groups()  # type: ignore
+        fullname = matches[1].strip()
         org = matches[2].strip()
+    elif rex_no_org.match(pinky_output):
+        matches = rex_no_org.match(pinky_output).groups()  # type: ignore
+        fullname = matches[1].strip()
+        org = ""
     else:
-        matches = rex_no_org.match(finger_output).groups()  # type: ignore
+        fullname = username
         org = ""
-    fullname = matches[1].strip()
+
     return f"{fullname} ({org}) ({username})"
 
 
@@ -138,7 +145,7 @@ def show_status(status: str = "RUN", title: str = "Running", umax: int = 10) ->
         print(
             count[0],
             userinfo(  # lgtm [py/clear-text-logging-sensitive-data]
-                str(user), call_finger
+                str(user), call_pinky
             ),
         )
     print("- - - - - - - - - - -")

{subscript-1.4.0 → subscript-1.5.0}/src/subscript/eclcompress/allowlist.py

@@ -42,6 +42,7 @@ ALLOWLIST_KEYWORDS = {
     "EXTREPGL",
     "FIP",
     "FIPNUM",
+    "FLUXNUM",
     "GASADCO",
     "GASADEC",
     "GASCONC",
@@ -66,6 +67,10 @@ ALLOWLIST_KEYWORDS = {
     "IONROCK",
     "ISTNUM",
     "KRNUMMF",
+    "KRO",
+    "KRORG",
+    "KRORW",
+    "KRW",
     "LANGMPL",
     "LANGMULC",
     "LANGMULT",
@@ -100,6 +105,7 @@ ALLOWLIST_KEYWORDS = {
     "LX",
     "LY",
     "LZ",
+    "MINPVV",
     "MISCNUM",
     "MLANG",
     "MLANGSLV",
@@ -161,6 +167,8 @@ ALLOWLIST_KEYWORDS = {
     "SATNUM",
     "SFOAM",
     "SGAS",
+    "SGCR",
+    "SGL",
     "SGLPC",
     "SGWCR",
     "SKRO",
@@ -169,11 +177,16 @@ ALLOWLIST_KEYWORDS = {
     "SKRW",
     "SKRWR",
     "SOCRS",
+    "SOGCR",
     "SOLVCONC",
     "SOLVFRAC",
     "SOLWNUM",
     "SORBFRAC",
     "SORBPRES",
+    "SOWCR",
+    "SWCR",
+    "SWL",
+    "SWU",
     "SPOLY",
     "SSGCR",
     "SSGL",

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.4.0
+Version: 1.5.0
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -768,7 +768,7 @@ pip install subscript
 ## Usage
 
 As a collection of utilities subscript has many different invocations and
-usages. It is recommended to visit the
+use cases. A complete overview can be found in the
 [documentation](https://equinor.github.io/subscript)
 for a complete overview.
 

{subscript-1.4.0 → subscript-1.5.0}/src/subscript.egg-info/SOURCES.txt

@@ -46,7 +46,6 @@ docs/scripts/restartthinner.rst
 docs/scripts/ri_wellmod.rst
 docs/scripts/rmsecl_volumetrics.rst
 docs/scripts/runeclipse.rst
-docs/scripts/runrms.rst
 docs/scripts/sector2fluxnum.rst
 docs/scripts/summaryplot.rst
 docs/scripts/sunsch.rst
@@ -155,8 +154,6 @@ src/subscript/ri_wellmod/__init__.py
 src/subscript/ri_wellmod/ri_wellmod.py
 src/subscript/rmsecl_volumetrics/__init__.py
 src/subscript/rmsecl_volumetrics/rmsecl_volumetrics.py
-src/subscript/runrms/__init__.py
-src/subscript/runrms/runrms.py
 src/subscript/sector2fluxnum/__init__.py
 src/subscript/sector2fluxnum/completions.py
 src/subscript/sector2fluxnum/datafile_obj.py
@@ -204,7 +201,6 @@ tests/test_prtvol2csv.py
 tests/test_restartthinner.py
 tests/test_ri_wellmod.py
 tests/test_rmsecl_volumetrics.py
-tests/test_runrms.py
 tests/test_sector2fluxnum.py
 tests/test_subscriptlogger.py
 tests/test_summaryplot.py
@@ -296,7 +292,6 @@ tests/testdata_ri_wellmod/drogon_include/grid/drogon.perm.grdecl
 tests/testdata_ri_wellmod/drogon_trajectories/rft_wells.dat
 tests/testdata_ri_wellmod/drogon_trajectories/wells.dat
 tests/testdata_ri_wellmod/reek_trajectories/reek_wells.dat
-tests/testdata_runrms/runrms.yml
 tests/testdata_sector2fluxnum/DUMPFLUX_TEST.DATA
 tests/testdata_sector2fluxnum/DUMPFLUX_TEST.EGRID
 tests/testdata_sector2fluxnum/DUMPFLUX_TEST.FLUX

{subscript-1.4.0 → subscript-1.5.0}/src/subscript.egg-info/entry_points.txt

@@ -21,7 +21,6 @@ prtvol2csv = subscript.prtvol2csv.prtvol2csv:main
 restartthinner = subscript.restartthinner.restartthinner:main
 ri_wellmod = subscript.ri_wellmod.ri_wellmod:main
 rmsecl_volumetrics = subscript.rmsecl_volumetrics.rmsecl_volumetrics:main
-runrms = subscript.runrms.runrms:main
 sector2fluxnum = subscript.sector2fluxnum.sector2fluxnum:main
 summaryplot = subscript.summaryplot.summaryplot:main
 sunsch = subscript.sunsch.sunsch:main

{subscript-1.4.0 → subscript-1.5.0}/tests/test_bjobsusers.py

@@ -19,16 +19,16 @@ def bjobs_errors(status):
     return "LIM not responding"
 
 
-class FakeFinger:
-    """Emulate the Linux finger utility"""
+class FakePinky:
+    """Emulate the Linux pinky utility"""
 
     # pylint:  disable=too-few-public-methods
     def __init__(self, name):
         self._name = name
 
     def __call__(self, username):
-        """Emulate the Linux finger utility"""
-        result = "Login: {}          Name: " + self._name
+        """Emulate the Linux pinky utility"""
+        result = "Login name: {}          In real life: " + self._name
         return subprocess.check_output(("echo", result)).decode("utf-8")
 
 
@@ -72,20 +72,20 @@ def test_userinfo():
         "",
     )
 
-    # assert isinstance(fake_finger(''), unicode)  # only relevant for Python 2
+    # assert isinstance(fake_pinky(''), unicode)  # only relevant for Python 2
     for name in names:
-        usersummary = bjobsusers.userinfo("foobar", FakeFinger(name))
+        usersummary = bjobsusers.userinfo("foobar", FakePinky(name))
         assert isinstance(usersummary, str)
         assert "Login" not in usersummary
         assert name in usersummary
 
 
-def test_systemfinger():
-    """Test the real system finger utility"""
+def test_systempinky():
+    """Test the real system pinky utility"""
     currentuser = getpass.getuser()
     if not currentuser:
         return
-    usersummary = bjobsusers.userinfo(currentuser, bjobsusers.call_finger)
+    usersummary = bjobsusers.userinfo(currentuser, bjobsusers.call_pinky)
     assert isinstance(usersummary, str)
     print("Myself is: " + usersummary)
     assert "Login" not in usersummary

subscript-1.4.0/docs/scripts/runrms.rst

@@ -1,8 +0,0 @@
-RUNRMS
-======
-
-.. argparse::
-   :module: subscript.runrms.runrms
-   :func: get_parser
-   :prog: runrms
-