Merge pull request #244 from sot/de-namespace

Change Ska.engarchive to cheta w/ back-compatibility
sot · Dec 23, 2022 · 847465a · 847465a
2 parents da80f54 + c352fbd
commit 847465a
Show file tree

Hide file tree

Showing 73 changed files with 104 additions and 148 deletions.
diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
@@ -16,6 +16,6 @@ jobs:
     - name: Lint with flake8
       run: |
         pip install flake8
-        # Note: only check files in Ska.engarchive package.  Many other files in
+        # Note: only check files in cheta package.  Many other files in
         # the repo are not maintained as PEP8 compliant.
-        flake8 Ska --count --ignore=W503,W504,F541,E203 --max-line-length=100 --show-source --statistics
+        flake8 cheta --count --ignore=W503,W504,F541,E203 --max-line-length=100 --show-source --statistics
diff --git a/.gitignore b/.gitignore
@@ -14,7 +14,7 @@ MANIFEST
 *.log
 *.fits.gz
 stage
-Ska.engarchive.egg-info
+cheta.egg-info
 sken.egg-info
 Ska/engarchive/GIT_VERSION
 test/eng_archive*
@@ -25,3 +25,4 @@ dev_utils/memleak.py
 *.ipynb
 .ipynb_checkpoints
 .idea
+.vscode
diff --git a/.hgignore b/.hgignore
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/alias_rename_files.py b/alias_rename_files.py
@@ -11,9 +11,9 @@
 
 import pyyaks.context
 
-import Ska.engarchive.fetch as fetch
-from Ska.engarchive.converters import ALIASES
-import Ska.engarchive.file_defs as file_defs
+import cheta.fetch as fetch
+from cheta.converters import ALIASES
+import cheta.file_defs as file_defs
 
 
 def get_options(args=None):

diff --git a/cheta b/cheta
diff --git a/Ska/engarchive/__init__.py → cheta/__init__.py b/Ska/engarchive/__init__.py → cheta/__init__.py
@@ -2,7 +2,7 @@
 
 import ska_helpers
 
-__version__ = ska_helpers.get_version("Ska.engarchive")
+__version__ = ska_helpers.get_version(__package__, distribution="cheta")
 
 
 def test(*args, **kwargs):

diff --git a/Ska/engarchive/add_derived.py → cheta/add_derived.py b/Ska/engarchive/add_derived.py → cheta/add_derived.py
@@ -14,9 +14,9 @@
 from Chandra.Time import DateTime
 from six.moves import cPickle as pickle
 
-import Ska.engarchive.derived as derived
-import Ska.engarchive.fetch as fetch
-import Ska.engarchive.file_defs as file_defs
+import cheta.derived as derived
+import cheta.fetch as fetch
+import cheta.file_defs as file_defs
 
 
 def get_options():

diff --git a/Ska/engarchive/archfiles_def.sql → cheta/archfiles_def.sql b/Ska/engarchive/archfiles_def.sql → cheta/archfiles_def.sql
diff --git a/Ska/engarchive/cache.py → cheta/cache.py b/Ska/engarchive/cache.py → cheta/cache.py
diff --git a/Ska/engarchive/check_integrity.py → cheta/check_integrity.py b/Ska/engarchive/check_integrity.py → cheta/check_integrity.py
@@ -11,7 +11,7 @@
 import tables
 from six.moves import cPickle as pickle
 
-import Ska.engarchive.fetch as fetch
+import cheta.fetch as fetch
 
 opt = None
 ft = fetch.ft

diff --git a/Ska/engarchive/converters.py → cheta/converters.py b/Ska/engarchive/converters.py → cheta/converters.py
diff --git a/Ska/engarchive/derived/__init__.py → cheta/derived/__init__.py b/Ska/engarchive/derived/__init__.py → cheta/derived/__init__.py
diff --git a/Ska/engarchive/derived/acispow.py → cheta/derived/acispow.py b/Ska/engarchive/derived/acispow.py → cheta/derived/acispow.py
diff --git a/Ska/engarchive/derived/base.py → cheta/derived/base.py b/Ska/engarchive/derived/base.py → cheta/derived/base.py
@@ -12,7 +12,7 @@
 
 MNF_TIME = 0.25625  # Minor Frame duration (seconds)
 
-logger = logging.getLogger("Ska.engarchive.fetch")
+logger = logging.getLogger("cheta.fetch")
 
 
 def times_indexes(start, stop, dt):

diff --git a/Ska/engarchive/derived/comps.py → cheta/derived/comps.py b/Ska/engarchive/derived/comps.py → cheta/derived/comps.py
diff --git a/Ska/engarchive/derived/eps.py → cheta/derived/eps.py b/Ska/engarchive/derived/eps.py → cheta/derived/eps.py
diff --git a/Ska/engarchive/derived/mups_valve.py → cheta/derived/mups_valve.py b/Ska/engarchive/derived/mups_valve.py → cheta/derived/mups_valve.py
diff --git a/Ska/engarchive/derived/orbit.py → cheta/derived/orbit.py b/Ska/engarchive/derived/orbit.py → cheta/derived/orbit.py
@@ -22,7 +22,7 @@
 
 Example::
 
-  >>> from Ska.engarchive import fetch_eng as fetch
+  >>> from cheta import fetch_eng as fetch
 
   >>> dat = fetch.Msidset(['inclination', 'perigee_radius'], '1999:200', stat='daily')
   >>> subplot(2, 1, 1)

diff --git a/Ska/engarchive/derived/pcad.py → cheta/derived/pcad.py b/Ska/engarchive/derived/pcad.py → cheta/derived/pcad.py
diff --git a/Ska/engarchive/derived/test.py → cheta/derived/test.py b/Ska/engarchive/derived/test.py → cheta/derived/test.py
diff --git a/Ska/engarchive/derived/thermal.py → cheta/derived/thermal.py b/Ska/engarchive/derived/thermal.py → cheta/derived/thermal.py
diff --git a/Ska/engarchive/fetch.py → cheta/fetch.py b/Ska/engarchive/fetch.py → cheta/fetch.py
@@ -327,7 +327,7 @@ def emit(self, record):
         pass
 
 
-logger = logging.getLogger("Ska.engarchive.fetch")
+logger = logging.getLogger("cheta.fetch")
 logger.addHandler(NullHandler())
 logger.propagate = False
 

diff --git a/Ska/engarchive/fetch_eng.py → cheta/fetch_eng.py b/Ska/engarchive/fetch_eng.py → cheta/fetch_eng.py
diff --git a/Ska/engarchive/fetch_old.py → cheta/fetch_old.py b/Ska/engarchive/fetch_old.py → cheta/fetch_old.py
diff --git a/Ska/engarchive/fetch_sci.py → cheta/fetch_sci.py b/Ska/engarchive/fetch_sci.py → cheta/fetch_sci.py
diff --git a/Ska/engarchive/file_defs.py → cheta/file_defs.py b/Ska/engarchive/file_defs.py → cheta/file_defs.py
diff --git a/Ska/engarchive/filetypes.dat → cheta/filetypes.dat b/Ska/engarchive/filetypes.dat → cheta/filetypes.dat
diff --git a/Ska/engarchive/fix_bad_values.py → cheta/fix_bad_values.py b/Ska/engarchive/fix_bad_values.py → cheta/fix_bad_values.py
@@ -50,8 +50,8 @@
 import tables
 from Chandra.Time import DateTime
 
-import Ska.engarchive.file_defs as file_defs
-from Ska.engarchive import fetch
+import cheta.file_defs as file_defs
+from cheta import fetch
 
 ft = fetch.ft
 opt = None

diff --git a/Ska/engarchive/get_telem.py → cheta/get_telem.py b/Ska/engarchive/get_telem.py → cheta/get_telem.py
@@ -181,7 +181,7 @@ def get_telem(
     # Set up output logging
     from pyyaks.logger import get_logger
 
-    logger = get_logger(name="Ska.engarchive.get_telem", level=(100 if quiet else -100))
+    logger = get_logger(name="cheta.get_telem", level=(100 if quiet else -100))
 
     # Set defaults and translate to fetch keywords
     stop = DateTime(stop)

diff --git a/Ska/engarchive/lazy.py → cheta/lazy.py b/Ska/engarchive/lazy.py → cheta/lazy.py
diff --git a/Ska/engarchive/msid_bad_times.dat → cheta/msid_bad_times.dat b/Ska/engarchive/msid_bad_times.dat → cheta/msid_bad_times.dat
diff --git a/Ska/engarchive/plot.py → cheta/plot.py b/Ska/engarchive/plot.py → cheta/plot.py
@@ -53,7 +53,7 @@ class MsidPlot(object):
     Example::
 
       dat = fetch.Msid('aoattqt1', '2011:001', '2012:001', stat='5min')
-      iplot = Ska.engarchive.MsidPlot(dat)
+      iplot = cheta.MsidPlot(dat)
 
     Caveat: the ``MsidPlot()`` class is not meant for use within scripts, and
     may give unexpected results if used in combination with other plotting

diff --git a/Ska/engarchive/remote_access.py → cheta/remote_access.py b/Ska/engarchive/remote_access.py → cheta/remote_access.py
diff --git a/task_schedule.cfg → cheta/task_schedule.cfg b/task_schedule.cfg → cheta/task_schedule.cfg
diff --git a/Ska/engarchive/tests/__init__.py → cheta/tests/__init__.py b/Ska/engarchive/tests/__init__.py → cheta/tests/__init__.py
diff --git a/Ska/engarchive/tests/fetch_regr.dat → cheta/tests/fetch_regr.dat b/Ska/engarchive/tests/fetch_regr.dat → cheta/tests/fetch_regr.dat
diff --git a/Ska/engarchive/tests/test_comps.py → cheta/tests/test_comps.py b/Ska/engarchive/tests/test_comps.py → cheta/tests/test_comps.py
diff --git a/Ska/engarchive/tests/test_data_source.py → cheta/tests/test_data_source.py b/Ska/engarchive/tests/test_data_source.py → cheta/tests/test_data_source.py
diff --git a/Ska/engarchive/tests/test_fetch.py → cheta/tests/test_fetch.py b/Ska/engarchive/tests/test_fetch.py → cheta/tests/test_fetch.py
diff --git a/Ska/engarchive/tests/test_intervals.py → cheta/tests/test_intervals.py b/Ska/engarchive/tests/test_intervals.py → cheta/tests/test_intervals.py
diff --git a/Ska/engarchive/tests/test_orbit.py → cheta/tests/test_orbit.py b/Ska/engarchive/tests/test_orbit.py → cheta/tests/test_orbit.py
diff --git a/Ska/engarchive/tests/test_remote_access.py → cheta/tests/test_remote_access.py b/Ska/engarchive/tests/test_remote_access.py → cheta/tests/test_remote_access.py
@@ -16,7 +16,7 @@
     >>> import os os.environ.pop('SKA', None)
     >>> os.environ.pop('ENG_ARCHIVE', None)
     >>> os.environ.pop('SKA_ACCESS_REMOTELY', None)
-    >>> from Ska.engarchive import fetch, remote_access
+    >>> from cheta import fetch, remote_access
     >>> fetch.add_logging_handler()
     >>> assert remote_access.access_remotely is True
     >>> dat = fetch.Msid('tephin', '2018:001', '2018:010')
@@ -30,7 +30,7 @@
     >>> os.environ['SKA'] = <path_to_ska_root>
     >>> os.environ.pop('ENG_ARCHIVE', None)
     >>> os.environ.pop('SKA_ACCESS_REMOTELY', None)
-    >>> from Ska.engarchive import fetch, remote_access
+    >>> from cheta import fetch, remote_access
     >>> fetch.add_logging_handler()
     >>> assert remote_access.access_remotely is False
     >>> dat = fetch.Msid('1wrat', '2018:001', '2018:010')
@@ -41,7 +41,7 @@
 
     >>> import os
     >>> os.environ['SKA_ACCESS_REMOTELY'] = 'True'
-    >>> from Ska.engarchive
+    >>> from cheta
     >>> import fetch, remote_access
     >>> fetch.add_logging_handler()
     >>> assert remote_access.access_remotely is True
@@ -77,7 +77,7 @@
 import pytest
 from astropy.utils.exceptions import AstropyUserWarning
 
-from Ska.engarchive.remote_access import get_data_access_info
+from cheta.remote_access import get_data_access_info
 
 INVALID_DIR = str(Path(__file__).parent / "__non_existent_invalid_directory____")
 

diff --git a/Ska/engarchive/tests/test_sync.py → cheta/tests/test_sync.py b/Ska/engarchive/tests/test_sync.py → cheta/tests/test_sync.py
diff --git a/Ska/engarchive/tests/test_units.py → cheta/tests/test_units.py b/Ska/engarchive/tests/test_units.py → cheta/tests/test_units.py
diff --git a/Ska/engarchive/tests/test_units_reversed.py → cheta/tests/test_units_reversed.py b/Ska/engarchive/tests/test_units_reversed.py → cheta/tests/test_units_reversed.py
diff --git a/Ska/engarchive/tests/test_utils.py → cheta/tests/test_utils.py b/Ska/engarchive/tests/test_utils.py → cheta/tests/test_utils.py
diff --git a/Ska/engarchive/units.py → cheta/units.py b/Ska/engarchive/units.py → cheta/units.py
@@ -52,7 +52,7 @@ def emit(self, record):
         pass
 
 
-logger = logging.getLogger("Ska.engarchive.units")
+logger = logging.getLogger("cheta.units")
 logger.addHandler(NullHandler())
 logger.propagate = False
 
@@ -250,7 +250,7 @@ def convert(msid, vals, delta_val=False):
 class Units(dict):
     """
     Provide access to units via object-oriented replacement for
-    Ska.engarchive.units module.
+    cheta.units module.
 
     This class is weird because it was designed to conform to the
     existing API where units.units was a module dict that had keys

diff --git a/Ska/engarchive/units_cxc.pkl → cheta/units_cxc.pkl b/Ska/engarchive/units_cxc.pkl → cheta/units_cxc.pkl
diff --git a/Ska/engarchive/units_eng.pkl → cheta/units_eng.pkl b/Ska/engarchive/units_eng.pkl → cheta/units_eng.pkl
diff --git a/Ska/engarchive/units_sci.pkl → cheta/units_sci.pkl b/Ska/engarchive/units_sci.pkl → cheta/units_sci.pkl
diff --git a/Ska/engarchive/update_archive.py → cheta/update_archive.py b/Ska/engarchive/update_archive.py → cheta/update_archive.py
@@ -25,10 +25,10 @@
 from Chandra.Time import DateTime
 from ska_helpers.retry import tables_open_file
 
-import Ska.engarchive.converters as converters
-import Ska.engarchive.derived as derived
-import Ska.engarchive.fetch as fetch
-import Ska.engarchive.file_defs as file_defs
+import cheta.converters as converters
+import cheta.derived
+import cheta.fetch as fetch
+import cheta.file_defs as file_defs
 
 
 def get_options(args=None):
@@ -656,7 +656,7 @@ def update_derived(filetype):
     msids = set()
     time_step = None
     for colname in colnames:
-        dp_class = getattr(derived, colname)
+        dp_class = getattr(cheta.derived, colname)
         dp = dp_class()
         msids = msids.union([x.upper() for x in dp.rootparams])
         time_step = dp.time_step  # will be the same for every DP
@@ -998,7 +998,7 @@ def read_derived(i, filename, filetype, row, colnames, archfiles, db):
     index0 = int(index0)
     index1 = int(index1)
     mnf_step = int(re.search(r"(\d+)$", content).group(1))
-    time_step = mnf_step * derived.MNF_TIME
+    time_step = mnf_step * cheta.derived.MNF_TIME
     times = time_step * np.arange(index0, index1)
 
     logger.info("Reading (%d / %d) %s" % (i, len(archfiles), filename))
@@ -1009,7 +1009,7 @@ def read_derived(i, filename, filetype, row, colnames, archfiles, db):
             vals[colname] = times
             bads[:, i] = False
         else:
-            dp_class = getattr(Ska.engarchive.derived, colname.upper())
+            dp_class = getattr(cheta.derived, colname.upper())
             dp = dp_class()
             dataset = dp.fetch(times[0] - 1000, times[-1] + 1000)
             ok = (index0 <= dataset.indexes) & (dataset.indexes < index1)

diff --git a/Ska/engarchive/update_client_archive.py → cheta/update_client_archive.py b/Ska/engarchive/update_client_archive.py → cheta/update_client_archive.py
@@ -39,7 +39,7 @@
 from . import __version__, file_defs
 from .utils import STATS_DT, get_date_id
 
-sync_files = pyyaks.context.ContextDict("update_client_archive.sync_files")
+sync_files = pyyaks.context.ContextDict(f"{__name__}.sync_files")
 sync_files.update(file_defs.sync_files)
 
 process_errors = []

diff --git a/Ska/engarchive/update_server_sync.py → cheta/update_server_sync.py b/Ska/engarchive/update_server_sync.py → cheta/update_server_sync.py
@@ -48,7 +48,7 @@
 from . import fetch, file_defs
 from .utils import STATS_DT, get_date_id
 
-sync_files = pyyaks.context.ContextDict("update_server_sync.sync_files")
+sync_files = pyyaks.context.ContextDict(f"{__name__}.sync_files")
 sync_files.update(file_defs.sync_files)
 
 

diff --git a/Ska/engarchive/utils.py → cheta/utils.py b/Ska/engarchive/utils.py → cheta/utils.py
@@ -109,7 +109,7 @@ def ss_vector(start, stop=None, obj="Earth"):
 
     Example::
 
-      from Ska.engarchive.utils import ss_vector
+      from cheta.utils import ss_vector
       from Ska.Matplotlib import plot_cxctime
       vec = ss_vector('2010:001', '2010:030', obj='Sun')
       figure(1)
@@ -263,7 +263,7 @@ def logical_intervals(times, bools, complete_intervals=False, max_gap=None):
 
     Example (find SCS107 runs via telemetry)::
 
-      >>> from Ska.engarchive import utils, fetch
+      >>> from cheta import utils, fetch
       >>> dat = fetch.Msidset(['3tscmove', 'aorwbias', 'coradmen'], '2012:190', '2012:205')
       >>> dat.interpolate(32.8)  # Sample MSIDs onto 32.8 second intervals (like 3TSCMOVE)
       >>> scs107 = ((dat['3tscmove'].vals == 'T')
@@ -314,7 +314,7 @@ def state_intervals(times, vals):
 
     Example::
 
-      >>> from Ska.engarchive import fetch, utils
+      >>> from cheta import fetch, utils
       >>> dat = fetch.Msid('cobsrqid', '2010:003:12:00:00', '2010:004:12:00:00')
       >>> obsids = utils.state_intervals(dat.times, dat.vals)
       >>> print(obsids['datestart', 'datestop', 'val'])

diff --git a/dev_utils/example_interpolate.py b/dev_utils/example_interpolate.py
@@ -2,7 +2,7 @@
 import numpy as np
 
 from Ska.Matplotlib import plot_cxctime
-from Ska.engarchive import fetch_eng as fetch
+from cheta import fetch_eng as fetch
 
 
 def plot_both(x, title_str):

diff --git a/dev_utils/remote.py b/dev_utils/remote.py
@@ -6,5 +6,5 @@
 
 @dview.remote(block=True)
 def remote_fetch(*args, **kwargs):
-    import Ska.engarchive.fetch_eng as fetch
+    import cheta.fetch_eng as fetch
     return fetch.Msid(*args, **kwargs)
diff --git a/dev_utils/validate_tdb_updates.py b/dev_utils/validate_tdb_updates.py
@@ -4,7 +4,7 @@
 import pickle
 import os
 import Ska.tdb
-from Ska.engarchive import fetch_eng as fetch
+from cheta import fetch_eng as fetch
 from matplotlib import pyplot as plt
 
 for content in os.listdir('data'):

diff --git a/docs/conf.py b/docs/conf.py
@@ -54,7 +54,7 @@
 copyright = u'2011, Tom Aldcroft'
 
 # The full version, including alpha/beta/rc tags.  Already defined above.
-from Ska.engarchive import __version__ as release
+from cheta import __version__ as release
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.

diff --git a/docs/examples/cmp_obc_gyro.py b/docs/examples/cmp_obc_gyro.py
@@ -1,5 +1,5 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
-import Ska.engarchive.fetch as fetch
+import cheta.fetch as fetch
 from Ska.Matplotlib import plot_cxctime
 import Ska.Numpy
 

diff --git a/docs/fetchplots/make_interpolate.py b/docs/fetchplots/make_interpolate.py
@@ -12,7 +12,7 @@
 import numpy as np
 
 from Ska.Matplotlib import plot_cxctime
-from Ska.engarchive import fetch_eng as fetch
+from cheta import fetch_eng as fetch
 import matplotlib.pyplot as plt