Merge branch 'SAR-65-remove-metaclass' into 'master'

SAR-65 remove metaclass (and 0.4.0 release)

See merge request ska-telescope/lmc-base-classes!12

.release

-release=0.3.1
-tag=lmcbaseclasses-0.3.1
+release=0.4.0
+tag=lmcbaseclasses-0.4.0

README.md

@@ -25,7 +25,7 @@ The lmc-base-classe repository contains set of eight classes as mentioned in SKA
 
 ## Version History
 
-#### 0.4.0 (unreleased)
+#### 0.4.0
 - Changed all `DevEnum` attributes to use Python `enum.IntEnum` classes.  These can be imported from the
   new `control_model` namespace, e.g., `skabase.control_model import AdminMode`.
 - The names of some of the enumeration labels were changed to better match the Control Systems Guidelines.
@@ -36,6 +36,7 @@ The lmc-base-classe repository contains set of eight classes as mentioned in SKA
 - Changed `testMode` attribute from `str` to enumerated type: `TestMode`.
 - Deprecated `TangoLoggingLevel`.  Will be removed in version 0.5.0.  Use `skabase.control_model.LoggingLevel`
   instead.
+- Remove unnecessary usage of `DeviceMeta` class.
 
 #### 0.3.1
 - Used `ska_logging` library instead of defining logging format and handlers locally.
@@ -108,7 +109,7 @@ The base classes are installed as python package in the system. The intended usa
 ```
 from skabase.SKABaseDevice.SKABaseDevice import SKABaseDevice
 
-class DishLeafNode(with_metaclass(DeviceMeta, SKABaseDevice)):
+class DishLeafNode(SKABaseDevice):
 .
 .
 .

docs/source/conf.py

@@ -22,11 +22,11 @@
 #         return MagicMock()
 #
 # # Mock tango modules
-# MOCK_MODULES = ['PyTango', 'tango', 'tango.server', 'run', 'DeviceMeta', 'command',
+# MOCK_MODULES = ['PyTango', 'tango', 'tango.server', 'run', 'command',
 #                 'future', 'future.utils', 'logging', 'logging.handlers']
 # sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
 
-autodoc_mock_imports = ['PyTango', 'tango', 'tango.server', 'run', 'DeviceMeta', 'command',
+autodoc_mock_imports = ['PyTango', 'tango', 'tango.server', 'run', 'command',
                         'future', 'future.utils', 'ska_logging.configuration']
 
 import sys

skabase/SKAAlarmHandler/SKAAlarmHandler.py

@@ -14,11 +14,10 @@ attribute values and quality factors, and are separate from the "built-in" TANGO
 # Standard imports
 import os
 import sys
-from future.utils import with_metaclass
 
 # Tango imports
 from tango import DebugIt
-from tango.server import run, DeviceMeta, attribute, command, device_property
+from tango.server import run, attribute, command, device_property
 
 # SKA specific imports
 from skabase import release
@@ -31,7 +30,7 @@ from SKABaseDevice import SKABaseDevice
 __all__ = ["SKAAlarmHandler", "main"]
 
 
-class SKAAlarmHandler(with_metaclass(DeviceMeta, SKABaseDevice)):
+class SKAAlarmHandler(SKABaseDevice):
     """
     A generic base device for Alarms for SKA.
     """

skabase/SKABaseDevice/SKABaseDevice.py

@@ -18,12 +18,10 @@ import os
 import sys
 import threading
 
-from future.utils import with_metaclass
-
 # Tango imports
 import tango
 from tango import DebugIt
-from tango.server import run, Device, DeviceMeta, attribute, command, device_property
+from tango.server import run, Device, attribute, command, device_property
 from tango import AttrQuality, AttrWriteType
 from tango import DeviceProxy, DevFailed
 
@@ -177,7 +175,7 @@ class LoggingUtils:
 __all__ = ["SKABaseDevice", "TangoLoggingLevel", "main"]
 
 
-class SKABaseDevice(with_metaclass(DeviceMeta, Device)):
+class SKABaseDevice(Device):
     """
     A generic base device for SKA.
     """

skabase/SKACapability/SKACapability.py

@@ -12,11 +12,10 @@ Capability handling device
 # Standard import
 import os
 import sys
-from future.utils import with_metaclass
 
 # Tango imports
 from tango import DebugIt
-from tango.server import run, DeviceMeta, attribute, command, device_property
+from tango.server import run, attribute, command, device_property
 
 # SKA specific imports
 from skabase import release
@@ -30,7 +29,7 @@ from SKAObsDevice import SKAObsDevice
 __all__ = ["SKACapability", "main"]
 
 
-class SKACapability(with_metaclass(DeviceMeta, SKAObsDevice)):
+class SKACapability(SKAObsDevice):
     """
     A Subarray handling device. It exposes the instances of configured capabilities.
     """

skabase/SKALogger/SKALogger.py

@@ -13,11 +13,10 @@ and to store logs using Python logging. It configures the log levels of remote l
 # Standard imports
 import os
 import sys
-from future.utils import with_metaclass
 
 # Tango imports
 from tango import DebugIt, DeviceProxy, DevFailed
-from tango.server import run, DeviceMeta, command
+from tango.server import run, command
 
 # SKA specific imports
 from skabase import release
@@ -31,7 +30,7 @@ from SKABaseDevice import SKABaseDevice
 __all__ = ["SKALogger", "main"]
 
 
-class SKALogger(with_metaclass(DeviceMeta, SKABaseDevice)):
+class SKALogger(SKABaseDevice):
     """
     A generic base device for Logging for SKA.
     """

skabase/SKAMaster/SKAMaster.py

@@ -13,11 +13,10 @@ A master test
 # Standard imports
 import os
 import sys
-from future.utils import with_metaclass
 
 # Tango imports
 from tango import DebugIt
-from tango.server import run, DeviceMeta, attribute, command, device_property
+from tango.server import run, attribute, command, device_property
 
 # SKA specific imports
 from skabase import release
@@ -37,7 +36,7 @@ from utils import (validate_capability_types, validate_input_sizes, convert_dict
 __all__ = ["SKAMaster", "main"]
 
 
-class SKAMaster(with_metaclass(DeviceMeta, SKABaseDevice)):
+class SKAMaster(SKABaseDevice):
     """
     A master test
     """

skabase/SKAObsDevice/SKAObsDevice.py

@@ -15,10 +15,9 @@ an obsMode will inherit from SKAObsDevice instead of just SKABaseDevice.
 # Standard imports
 import os
 import sys
-from future.utils import with_metaclass
 
 # Tango imports
-from tango.server import run, DeviceMeta, attribute
+from tango.server import run, attribute
 
 # SKA specific imports
 from skabase import release
@@ -33,8 +32,7 @@ from SKABaseDevice import SKABaseDevice
 __all__ = ["SKAObsDevice", "main"]
 
 
-
-class SKAObsDevice(with_metaclass(DeviceMeta, SKABaseDevice)):
+class SKAObsDevice(SKABaseDevice):
     """
     A generic base device for Observations for SKA.
     """

skabase/SKASubarray/SKASubarray.py

@@ -13,11 +13,10 @@ capabilities, and exposes the related information like assigned resources, confi
 # Standard imports
 import os
 import sys
-from future.utils import with_metaclass
 
 # Tango imports
 from tango import DebugIt
-from tango.server import run, DeviceMeta, attribute, command
+from tango.server import run, attribute, command
 from tango.server import device_property
 from tango import Except, ErrSeverity, DevState
 
@@ -34,7 +33,7 @@ from SKAObsDevice import SKAObsDevice
 __all__ = ["SKASubarray", "main"]
 
 
-class SKASubarray(with_metaclass(DeviceMeta, SKAObsDevice)):
+class SKASubarray(SKAObsDevice):
     """
     SubArray handling device
     """

skabase/SKATelState/SKATelState.py

@@ -12,10 +12,9 @@ A generic base device for Telescope State for SKA.
 # Standard import
 import os
 import sys
-from future.utils import with_metaclass
 
 # Tango imports
-from tango.server import run, DeviceMeta, device_property
+from tango.server import run, device_property
 
 # SKA specific imports
 from skabase import release
@@ -29,7 +28,7 @@ from SKABaseDevice import SKABaseDevice
 __all__ = ["SKATelState", "main"]
 
 
-class SKATelState(with_metaclass(DeviceMeta, SKABaseDevice)):
+class SKATelState(SKABaseDevice):
     """
     A generic base device for Telescope State for SKA.
     """

skabase/SKATestDevice/SKATestDevice.py

@@ -13,13 +13,12 @@ A generic Test device for testing SKA base class functionalities.
 import os
 import sys
 import json
-from future.utils import with_metaclass
 
 # Tango imports
 import tango
 from tango import DebugIt
 from tango.server import run
-from tango.server import DeviceMeta, attribute, command
+from tango.server import attribute, command
 
 # SKA specific imports
 from skabase import release
@@ -36,7 +35,7 @@ from skabase.auxiliary.utils import (exception_manager, convert_api_value, coerc
 __all__ = ["SKATestDevice", "main"]
 
 
-class SKATestDevice(with_metaclass(DeviceMeta, SKABaseDevice)):
+class SKATestDevice(SKABaseDevice):
     """
     A generic Test device for testing SKA base class functionalities.
     """

skabase/release.py

@@ -7,7 +7,7 @@
 """Release information for lmc-base-classes Python Package"""
 
 name = """lmcbaseclasses"""
-version = "0.3.1"
+version = "0.4.0"
 version_info = version.split(".")
 description = """A set of generic base devices for SKA Telescope."""
 author = "SKA India and SARAO"