Move shellouts

Coupled_Drivers/cice_driver.py

@@ -26,7 +26,6 @@
 import re
 import datetime
 import time
-import subprocess
 import time2days
 import inc_days
 import common

Coupled_Drivers/common.py

@@ -234,6 +234,10 @@ def exec_subproc_timeout(cmd, timeout_sec=10):
     the commands to be run, and an integer timeout_sec for how long to
     wait for the command to run. Returns the return code from the process
     and the standard out from the command or 'None' if the command times out.
+
+    This function is now DEPRECATED in favour of the exec_shellout function in
+    mocilib
+
     '''
     process = subprocess.Popen(cmd, shell=False,
                                stdin=subprocess.PIPE,
@@ -260,6 +264,10 @@ def exec_subproc(cmd, verbose=True):
     Execute given shell command. Takes a list containing the commands to be
     run, and a logical verbose which if set to true will write the output of
     the command to stdout.
+
+    This function is now DEPRECATED in favour of the exec_shellout function in
+    mocilib
+
     '''
     process = subprocess.Popen(cmd, shell=False,
                                stdin=subprocess.PIPE,
@@ -281,6 +289,10 @@ def __exec_subproc_true_shell(cmd, verbose=True):
     exec_subproc does not work correctly. Takes a list containing the commands
     to be run, and a logical verbose which if set to true will write the
     output of the command to stdout.
+
+    This function is now DEPRECATED in favour of the exec_shellout function in
+    mocilib
+
     '''
     process = subprocess.Popen(cmd, shell=True,
                                stdin=subprocess.PIPE,

Coupled_Drivers/mct_driver.py

@@ -28,6 +28,7 @@
 import dr_env_lib.mct_def
 import dr_env_lib.env_lib
 import cpmip_controller
+
 try:
     import f90nml
 except ImportError:

Coupled_Drivers/rivers_driver.py

@@ -26,6 +26,7 @@
 import error
 import dr_env_lib.rivers_def
 import dr_env_lib.env_lib
+
 try:
     import f90nml
 except ImportError:

Postprocessing/build/build_pp.sh

@@ -20,7 +20,7 @@ PP_SOURCE_DIR=${PP_SOURCE_DIR:=$CYLC_WORKFLOW_RUN_DIR/share/source/moci_postproc
 PP_TARGET_DIR=${PP_TARGET_DIR:-$CYLC_WORKFLOW_SHARE_DIR/bin}
 
 MOCILIB=${MOCILIB:=true}
-MOCILIB_PATH=${MOCILIB_PATH:=$CYLC_WORKFLOW_RUN_DIR/share/moci/mocilib}
+MOCILIB_PATH=${MOCILIB_PATH:=$CYLC_WORKFLOW_SHARE_DIR/source/moci/mocilib}
 
 PP_COMPONENTS="atmos nemocice unicicles archive_verify"
 PP_TESTS=${PP_TESTS:=false}
@@ -38,10 +38,12 @@ if [[ ! -d $PP_TARGET_DIR ]] ; then
 fi
 
 # Copy mocilib
+
 if [[ "$MOCILIB" != true ]] ; then
     echo [INFO] MOCIlib library not installed
 elif [[ -d "$MOCILIB_PATH" ]] ; then
-    cp -r $MOCILIB $PP_TARGET_DIR
+    echo [INFO] Copying MOCILIB ...
+    cp -r $MOCILIB_PATH $PP_TARGET_DIR
 else
     echo [ERROR] Failed to find the required \"mocilib\" library >&2
     exit 1

Postprocessing/common/utils.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 '''
 *****************************COPYRIGHT******************************
- (C) Crown copyright 2015-2025 Met Office. All rights reserved.
+ (C) Crown copyright 2015-2026 Met Office. All rights reserved.
 
  Use, duplication or disclosure of this code is subject to the restrictions
  as set forth in the licence. If no licence has been raised with this copy
@@ -23,9 +23,9 @@
 import os
 import errno
 import shutil
-import subprocess
 import timer
 
+from mocilib import shellout
 
 globals()['debug_mode'] = None
 globals()['debug_ok'] = True
@@ -165,37 +165,26 @@ def exec_subproc(cmd, verbose=True, cwd=os.getcwd()):
                 failure of the command
                 True: reproduce std.out regardless of outcome
       cwd     = Directory in which to execute the command
-    '''
-    import shlex
 
-    cmd_array = [cmd]
-    if not isinstance(cmd, list):
-        cmd_array = cmd.split(';')
-        for i, cmd in enumerate(cmd_array):
-            # Use shlex.split to cope with arguments that contain whitespace
-            cmd_array[i] = shlex.split(cmd)
+    This function is now DEPRECATED in favour of the exec_subprocess function in
+    mocilib
 
+    '''
+    if isinstance(cmd, list):
+        cmd_array = [' '.join(cmd)]
+    else:
+        cmd_array = cmd.split(';')
     # Initialise rcode, in the event there is no command
-    rcode = 99
+    rcode = -99
     output = 'No command provided'
 
-    for cmd in cmd_array:
-        try:
-            output = subprocess.check_output(cmd,
-                                             stderr=subprocess.STDOUT,
-                                             universal_newlines=True, cwd=cwd)
-            rcode = 0
-            if verbose:
-                log_msg('[SUBPROCESS]: ' + str(output))
-        except subprocess.CalledProcessError as exc:
-            output = exc.output
-            rcode = exc.returncode
-        except OSError as exc:
-            output = exc.strerror
-            rcode = exc.errno
+    for i, cmd in enumerate(cmd_array):
+        rcode, output = shellout.exec_subprocess(
+            cmd, verbose=verbose, current_working_directory=cwd
+        )
         if rcode != 0:
-            msg = '[SUBPROCESS]: Command: {}\n[SUBPROCESS]: Error = {}:\n\t{}'
-            log_msg(msg.format(' '.join(cmd), rcode, output), level='WARN')
+            msg = f'[SUBPROCESS]: Command: {cmd}\n[SUBPROCESS]: Error = {rcode}:\n\t {output}'
+            log_msg(msg, level='WARN')
             break
 
     return rcode, output