Merge pull request #269 from sot/ska-shell

Remove use of Ska.Shell
sot · May 12, 2022 · 7b71d02 · 7b71d02
2 parents 081035b + c032d66
commit 7b71d02
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/mica/report/report.py b/mica/report/report.py
@@ -19,7 +19,6 @@
 from astropy.time import Time
 import astropy.units as u
 
-from Ska.Shell import bash
 import agasc
 import Ska.DBI
 from cxotime import CxoTime
@@ -652,7 +651,7 @@ def main(obsid):
             newfile = os.path.join(outdir, os.path.basename(file))
             if not os.path.exists(newfile):
                 logger.debug("linking {} into {}".format(file, outdir))
-                bash("ln -s {} {}".format(file, outdir))
+                os.symlink(file, newfile)
         asp_dir = asp_l1.get_obs_dirs(obsid)['last']
         asp_logs = sorted(glob(os.path.join(asp_dir, "asp_l1_f*log*gz")))
         for log, interval in zip(asp_logs, vv['intervals']):

diff --git a/mica/starcheck/process.py b/mica/starcheck/process.py
@@ -9,7 +9,6 @@
 
 from six.moves import zip
 from Chandra.Time import DateTime
-import Ska.Shell
 import Ska.DBI
 
 from starcheck.parser import read_starcheck

diff --git a/mica/starcheck/tests/make_database.py b/mica/starcheck/tests/make_database.py
@@ -1,8 +1,8 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 import os
+import shutil
 import tempfile
 from Chandra.Time import DateTime
-from Ska.Shell import bash
 import mica.common
 
 # Override MICA_ARCHIVE with a temporary directory
@@ -17,4 +17,4 @@
 config['start'] = DateTime() - 30
 mica.starcheck.process.update(config)
 # Cleanup manually
-bash("rm -r {}".format(TESTDIR))
+shutil.rmtree(TESTDIR)