Merge pull request #55 from mhearne-usgs/cmdfix

Removed dependency on impactutils cmd module, allowing us to have imp…

environment.yml

@@ -3,7 +3,6 @@ channels:
 - conda-forge
 - defaults
 dependencies:
-- impactutils
 - numpy
 - pandas
 - scipy

makedocs.py

@@ -7,11 +7,9 @@
 import argparse
 import os.path
 import sys
-import tempfile
 import pathlib
-from distutils.dir_util import copy_tree
 
-from impactutils.io.cmd import get_command_output
+from ps2ff.cmd import get_command_output
 
 
 def main(args):
@@ -25,26 +23,24 @@ def main(args):
         Nothing. Function will exit upon success or failure.
 
     """
-    verbose = args.verbose
-
-    #-------------------------------------------------------------
+    # -------------------------------------------------------------
     # Some useful directories
-    #-------------------------------------------------------------
+    # -------------------------------------------------------------
     REPO_DIR = os.path.dirname(os.path.abspath(__file__))
     DOCS_DIR = os.path.join(REPO_DIR, 'docs')
-    API_DIR =  os.path.join(REPO_DIR, 'doc_source')
+    API_DIR = os.path.join(REPO_DIR, 'doc_source')
     PACKAGE_DIR = os.path.join(REPO_DIR, 'ps2ff')
 
-    #-------------------------------------------------------------
+    # -------------------------------------------------------------
     # what is the package called and who are the authors
-    #-------------------------------------------------------------
+    # -------------------------------------------------------------
     PACKAGE = "ps2ff"
     AUTHORS = 'Eric Thompson, Bruce Worden'
     verstr = '1.1'
 
-    #-------------------------------------------------------------
+    # -------------------------------------------------------------
     # run the api doc command; this creates the .rst files
-    #-------------------------------------------------------------
+    # -------------------------------------------------------------
     sys.stderr.write('Building ps2ff API documentation (REST)...\n')
     sphinx_cmd = 'sphinx-apidoc -o %s -f -e -l -M -d 12 -H %s -A "%s"'\
                  ' -V %s %s' % (API_DIR, PACKAGE, AUTHORS, verstr,
@@ -59,9 +55,9 @@ def main(args):
         print(stdout.decode('utf-8'))
         print(stderr.decode('utf-8'))
 
-    #--------------------------------------------
+    # --------------------------------------------
     # try to clean up some of the excess labeling
-    #--------------------------------------------
+    # --------------------------------------------
     clean_cmd = "sed -i '' -e 's/ module//g' `find %s/*.rst -type f "\
                 "-maxdepth 0 -print`" % API_DIR
     res, stdout, stderr = get_command_output(clean_cmd)
@@ -75,11 +71,12 @@ def main(args):
                 "-maxdepth 0 -print`" % API_DIR
     res, stdout, stderr = get_command_output(clean_cmd)
 
-    #-------------------------------------------------------------
+    # -------------------------------------------------------------
     # Build the html
-    #-------------------------------------------------------------
+    # -------------------------------------------------------------
     sys.stderr.write('Building ps2ff pages (HTML)...\n')
-    res, stdout, stderr = get_command_output('sphinx-build -a -E doc_source docs')
+    res, stdout, stderr = get_command_output(
+        'sphinx-build -a -E doc_source docs')
     if not res:
         raise Exception('Could not build HTML for API documentation. - '
                         'error "%s"' % stderr.decode())

ps2ff/cmd.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+import subprocess
+
+
+def get_command_output(cmd):
+    """
+    Method for calling external system command.
+
+    Args:
+        cmd: String command (e.g., 'ls -l', etc.).
+
+    Returns:
+        Three-element tuple containing a boolean indicating success or failure,
+        the stdout from running the command, and stderr.
+    """
+    proc = subprocess.Popen(cmd,
+                            shell=True,
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE
+                            )
+    stdout, stderr = proc.communicate()
+    retcode = proc.returncode
+    if retcode == 0:
+        retcode = True
+    else:
+        retcode = False
+    return (retcode, stdout, stderr)

tests/RjbRrup_test.py

@@ -1,7 +1,7 @@
 
 import pandas as pd
 import shutil
-from impactutils.io.cmd import get_command_output
+from ps2ff.cmd import get_command_output
 
 
 def test_rjb_WC94():

tests/fast_test.py

@@ -1,7 +1,7 @@
 
 import pandas as pd
 import shutil
-from impactutils.io.cmd import get_command_output
+from ps2ff.cmd import get_command_output
 
 
 def test_rrup_Sea10_slab():

tests/single_test.py

@@ -1,7 +1,7 @@
 
 import pandas as pd
 import shutil
-from impactutils.io.cmd import get_command_output
+from ps2ff.cmd import get_command_output
 
 
 def test_single():
@@ -120,8 +120,8 @@ def test_single_N1():
     # Clean up
     shutil.rmtree('DataSingle')
 
+
 if __name__ == '__main__':
     test_single()
     test_single_by_theta_false()
     test_single_N1()
-