diff --git a/.gitignore b/.gitignore index f6d3277d419dc0f3b09bd7528767d1d1284f0683..07cb04cc63a22d708949170b8ad2059f8bcb715f 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ htmlcov # Developer tools *~ .ropeproject - +.idea # Ansible *.retry diff --git a/docs/source/SKAAlarmHandler.rst b/docs/source/SKAAlarmHandler.rst index 6780071853fce8f3feb545fbcf93af2a82883de9..8faeae7792a974b2c752179c3f4f9455a6c62dec 100644 --- a/docs/source/SKAAlarmHandler.rst +++ b/docs/source/SKAAlarmHandler.rst @@ -10,5 +10,4 @@ SKA AlarmHandler :maxdepth: 2 .. automodule:: SKAAlarmHandler.SKAAlarmHandler - :members: SKAAlarmHandler - + :members: SKAAlarmHandler \ No newline at end of file diff --git a/docs/source/conf.py b/docs/source/conf.py index 3520889c479c9e91ddf5d30649e7a8d6a3e29050..991b1cbcee8bb0d90b1e280fd9cf74901d9f2443 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -14,7 +14,12 @@ import sys import os -from mock import Mock +from mock import Mock as MagicMock + +class Mock(MagicMock): + @classmethod + def __getattr__(cls, name): + return MagicMock() # Mock tango modules MOCK_MODULES = ['PyTango', 'tango', 'tango.server', 'run', 'DeviceMeta', 'command', @@ -25,7 +30,7 @@ sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES) # 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('../../skabase')) - +print ("from conf sys.path: ", sys.path) # -- General configuration ------------------------------------------------ # If your documentation needs a minimal Sphinx version, state it here. diff --git a/docs/source/index.rst b/docs/source/index.rst index cfc4a810c759070e11e3413f7ca9b11c5602375f..defdd2ec791a998e533bff242d7504f17224a8a7 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -12,13 +12,6 @@ Contents: :maxdepth: 2 SKA AlarmHandler<SKAAlarmHandler> - SKA BaseDevice<SKABaseDevice> - SKA Capability<SKACapability> - SKA Logger<SKALogger> - SKA Master<SKAMaster> - SKA ObsDevice<SKAObsDevice> - SKA Subarray<SKASubarray> - SKA TelState<SKATelState> Indices and tables ================== diff --git a/skabase/SKAAlarmHandler/SKAAlarmHandler.py b/skabase/SKAAlarmHandler/SKAAlarmHandler.py index 78d1b464aaa9ae4c375ee46a14c375d11fbc7160..ad489f51a5ad155924a5942a97f35b91eafae548 100644 --- a/skabase/SKAAlarmHandler/SKAAlarmHandler.py +++ b/skabase/SKAAlarmHandler/SKAAlarmHandler.py @@ -23,12 +23,15 @@ import os import sys from future.utils import with_metaclass -# SKA specific imports +# SKA specific imports\ +file_path = os.path.dirname(os.path.abspath(__file__)) +# TODO: remove the release.py file +sys.path.insert(0, os.path.abspath(os.path.join(file_path, os.curdir))) import release # DO NOT import after modifying system path -file_path = os.path.dirname(os.path.abspath(__file__)) basedevice_path = os.path.abspath(os.path.join(file_path, os.pardir)) + "/SKABaseDevice" sys.path.insert(0, basedevice_path) +print ("SKAAlarmHandler sys.path: ", sys.path) from SKABaseDevice import SKABaseDevice # PROTECTED REGION END # // SKAAlarmHandler.additionnal_import @@ -101,6 +104,7 @@ class SKAAlarmHandler(with_metaclass(DeviceMeta, SKABaseDevice)): def init_device(self): SKABaseDevice.init_device(self) + # TODO: maintain single version file. self._build_state = '{}, {}, {}'.format(release.name, release.version, release.description) self._version_id = release.version diff --git a/skabase/SKABaseDevice/SKABaseDevice.py b/skabase/SKABaseDevice/SKABaseDevice.py index fab127fe2d99ce50a6d6451692a1cf987f026a4d..8aa6e2d285fb7c1e1e920b9d4dedd6540334bed6 100644 --- a/skabase/SKABaseDevice/SKABaseDevice.py +++ b/skabase/SKABaseDevice/SKABaseDevice.py @@ -33,9 +33,12 @@ from builtins import range # SKA specific imports file_path = os.path.dirname(os.path.abspath(__file__)) +sys.path.insert(0, os.path.abspath(os.path.join(file_path, os.curdir))) +import release # DO NOT import after modifying system path + auxiliary_path = os.path.abspath(os.path.join(file_path, os.pardir)) + "/auxiliary" sys.path.insert(0, auxiliary_path) -import release # DO NOT import after modifying system path + from utils import (get_dp_command, exception_manager, tango_type_conversion, coerce_value, get_groups_from_json, get_tango_device_type_id) diff --git a/skabase/SKAMaster/SKAMaster.py b/skabase/SKAMaster/SKAMaster.py index 6e8384eed41f2715f32a944f61fc50193b4934d3..f7158ef0066b76104fa97707c46ba840bd481c2d 100644 --- a/skabase/SKAMaster/SKAMaster.py +++ b/skabase/SKAMaster/SKAMaster.py @@ -20,10 +20,6 @@ file_path = os.path.dirname(os.path.abspath(__file__)) basedevice_path = os.path.abspath(os.path.join(file_path, os.pardir)) + "/SKABaseDevice" sys.path.insert(0, basedevice_path) -# basedevice_path = os.path.abspath("..") + "/SKABaseDevice" -# sys.path.insert(0, basedevice_path) -print(("From SKAMaster sys.path: ", sys.path)) - # tango imports from tango import DebugIt from tango.server import run, DeviceMeta, attribute, command, device_property diff --git a/skabase/SKAObsDevice/SKAObsDevice.py b/skabase/SKAObsDevice/SKAObsDevice.py index 14aa792210cab103c7eb9fbba282f7f508b7c0f9..58818d358ee66015fe962158ab204049046fdbac 100644 --- a/skabase/SKAObsDevice/SKAObsDevice.py +++ b/skabase/SKAObsDevice/SKAObsDevice.py @@ -19,7 +19,6 @@ from future.utils import with_metaclass file_path = os.path.dirname(os.path.abspath(__file__)) basedevice_path = os.path.abspath(os.path.join(file_path, os.pardir)) + "/SKABaseDevice" sys.path.insert(0, basedevice_path) -print(("From SKAObsDevice sys.path: ", sys.path)) # tango imports from tango.server import run, DeviceMeta, attribute