bjobsusers Replace finger with pinky

src/subscript/bjobsusers/bjobsusers.py

@@ -11,7 +11,7 @@
 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,53 +77,55 @@ 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)"
     """
-    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
         org = matches[2].strip()
     else:
-        matches = rex_no_org.match(finger_output).groups()  # type: ignore
+        matches = rex_no_org.match(pinky_output).groups()  # type: ignore
         org = ""
     fullname = matches[1].strip()
     return f"{fullname} ({org}) ({username})"
@@ -138,7 +140,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("- - - - - - - - - - -")

src/subscript/casegen_upcars/model.py

@@ -468,9 +468,9 @@ def _build_grid(self):
         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
@@ -492,13 +492,13 @@ def _build_grid(self):
         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
@@ -771,9 +771,9 @@ def export_grdecl(self, filename):
         )
 
         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)
             ] = (

src/subscript/check_swatinit/check_swatinit.py

@@ -354,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.

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