From 35a9dfe67159b08da2a6e0ea5c00709539b4cfcf Mon Sep 17 00:00:00 2001
From: Anton Joubert <ajoubert@ska.ac.za>
Date: Mon, 16 Mar 2020 06:48:29 +0200
Subject: [PATCH] SAR-79 Update paths in docs for new structure

---
 docs/source/Control_Model.rst   | 2 +-
 docs/source/SKAAlarmHandler.rst | 4 ++--
 docs/source/SKABaseDevice.rst   | 4 ++--
 docs/source/SKACapability.rst   | 4 ++--
 docs/source/SKALogger.rst       | 4 ++--
 docs/source/SKAMaster.rst       | 4 ++--
 docs/source/SKAObsDevice.rst    | 4 ++--
 docs/source/SKASubarray.rst     | 4 ++--
 docs/source/SKATelState.rst     | 4 ++--
 docs/source/conf.py             | 5 ++---
 10 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/docs/source/Control_Model.rst b/docs/source/Control_Model.rst
index 194db835..94563102 100644
--- a/docs/source/Control_Model.rst
+++ b/docs/source/Control_Model.rst
@@ -9,7 +9,7 @@ SKA Control Model
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: control_model
+.. automodule:: ska.base.control_model
     :members:
     :undoc-members:
 
diff --git a/docs/source/SKAAlarmHandler.rst b/docs/source/SKAAlarmHandler.rst
index ecf3845d..9b0297fb 100644
--- a/docs/source/SKAAlarmHandler.rst
+++ b/docs/source/SKAAlarmHandler.rst
@@ -9,7 +9,7 @@ SKA AlarmHandler
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKAAlarmHandler
-.. autoclass:: SKAAlarmHandler
+.. automodule:: ska.base.alarm_handler_device
+.. autoclass:: ska.base.SKAAlarmHandler
    :members:
    :undoc-members:
diff --git a/docs/source/SKABaseDevice.rst b/docs/source/SKABaseDevice.rst
index 3bcc419b..9d410327 100644
--- a/docs/source/SKABaseDevice.rst
+++ b/docs/source/SKABaseDevice.rst
@@ -9,7 +9,7 @@ SKA BaseDevice
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKABaseDevice
-.. autoclass:: SKABaseDevice
+.. automodule:: ska.base.base_device
+.. autoclass:: ska.base.SKABaseDevice
    :members:
    :undoc-members:
diff --git a/docs/source/SKACapability.rst b/docs/source/SKACapability.rst
index c63c6019..f749103f 100644
--- a/docs/source/SKACapability.rst
+++ b/docs/source/SKACapability.rst
@@ -9,7 +9,7 @@ SKA Capability
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKACapability
-.. autoclass:: SKACapability
+.. automodule:: ska.base.capability_device
+.. autoclass:: ska.base.SKACapability
    :members:
    :undoc-members:
diff --git a/docs/source/SKALogger.rst b/docs/source/SKALogger.rst
index 0a333cc8..98415a32 100644
--- a/docs/source/SKALogger.rst
+++ b/docs/source/SKALogger.rst
@@ -9,7 +9,7 @@ SKA Logger
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKALogger
-.. autoclass:: SKALogger
+.. automodule:: ska.base.logger_device
+.. autoclass:: ska.base.SKALogger
    :members:
    :undoc-members:
diff --git a/docs/source/SKAMaster.rst b/docs/source/SKAMaster.rst
index 345f70fb..3788821b 100644
--- a/docs/source/SKAMaster.rst
+++ b/docs/source/SKAMaster.rst
@@ -9,7 +9,7 @@ SKA Master
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKAMaster
-.. autoclass:: SKAMaster
+.. automodule:: ska.base.master_device
+.. autoclass:: ska.base.SKAMaster
    :members:
    :undoc-members:
diff --git a/docs/source/SKAObsDevice.rst b/docs/source/SKAObsDevice.rst
index 18197923..013c6af9 100644
--- a/docs/source/SKAObsDevice.rst
+++ b/docs/source/SKAObsDevice.rst
@@ -9,7 +9,7 @@ SKA ObsDevice
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKAObsDevice
-.. autoclass:: SKAObsDevice
+.. automodule:: ska.base.obs_device
+.. autoclass:: ska.base.SKAObsDevice
    :members:
    :undoc-members:
diff --git a/docs/source/SKASubarray.rst b/docs/source/SKASubarray.rst
index 1a6fd122..4db79893 100644
--- a/docs/source/SKASubarray.rst
+++ b/docs/source/SKASubarray.rst
@@ -9,7 +9,7 @@ SKA Subarray
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKASubarray
-.. autoclass:: SKASubarray
+.. automodule:: ska.base.subarray_device
+.. autoclass:: ska.base.SKASubarray
    :members:
    :undoc-members:
diff --git a/docs/source/SKATelState.rst b/docs/source/SKATelState.rst
index aa091637..acd145f9 100644
--- a/docs/source/SKATelState.rst
+++ b/docs/source/SKATelState.rst
@@ -9,7 +9,7 @@ SKA TelState
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKATelState
-.. autoclass:: SKATelState
+.. automodule:: ska.base.tel_state_device
+.. autoclass:: ska.base.SKATelState
    :members:
    :undoc-members:
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 0a5669a6..7623d2ad 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -46,9 +46,8 @@ sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('../../'))
-sys.path.append(os.path.abspath('../../skabase'))
-from skabase import release
+sys.path.insert(0, os.path.abspath('../../src'))
+from ska.base import release
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-- 
GitLab