diff --git a/src/ska_tango_base/base/base_device.py b/src/ska_tango_base/base/base_device.py index f0e5a84b79c1bb9f742339781e4a09b89d08783e..005d1d9cd2625ff5e913500be2d048afa7ae5cd6 100644 --- a/src/ska_tango_base/base/base_device.py +++ b/src/ska_tango_base/base/base_device.py @@ -498,7 +498,7 @@ class SKABaseDevice(Device): SkaLevel = device_property(dtype="int16", default_value=4) """ Device property. - + Indication of importance of the device in the SKA hierarchy to support drill-down navigation: 1..6, with 1 highest. """ @@ -508,15 +508,15 @@ class SKABaseDevice(Device): ) """ Device property. - + Each string in the list is a JSON serialised dict defining the ``group_name``, ``devices`` and ``subgroups`` in the group. A Tango Group object is created for each item in the list, according to the hierarchy defined. This provides easy access to the managed devices in bulk, or individually. - + The general format of the list is as follows, with optional ``devices`` and ``subgroups`` keys:: - + [ {"group_name": "<name>", "devices": ["<dev name>", ...]}, {"group_name": "<name>", @@ -525,9 +525,9 @@ class SKABaseDevice(Device): {<nested group>}, ...]}, ... ] - + For example, a hierarchy of racks, servers and switches:: - + [ {"group_name": "servers", "devices": ["elt/server/1", "elt/server/2", "elt/server/3", "elt/server/4"]}, @@ -553,7 +553,7 @@ class SKABaseDevice(Device): ) """ Device property. - + Default logging level at device startup. See :py:class:`~ska_tango_base.control_model.LoggingLevel` """ @@ -563,7 +563,7 @@ class SKABaseDevice(Device): ) """ Device property. - + Default logging targets at device startup. See the project readme for details. """ @@ -592,7 +592,7 @@ class SKABaseDevice(Device): ) """ Device attribute. - + See :py:class:`~ska_tango_base.control_model.LoggingLevel` """ diff --git a/src/ska_tango_base/base/component_manager.py b/src/ska_tango_base/base/component_manager.py index 2b84a48261dbcffc3a49c645b8afe5c2c22288e4..049fcc1f310a600c75ecc8e154150641e83c27a1 100644 --- a/src/ska_tango_base/base/component_manager.py +++ b/src/ska_tango_base/base/component_manager.py @@ -12,7 +12,7 @@ The basic model is: * A software routine, possibly implemented within the Tango device itself - + * In a hierarchical system, a pool of lower-level Tango devices. * A Tango device will usually need to establish and maintain a diff --git a/src/ska_tango_base/commands.py b/src/ska_tango_base/commands.py index ea50f7a88dbd493d78d68603c6dfc355ffc77b5c..ac28b9ec3a99b5dd07560fd2e8646bf7d3314a72 100644 --- a/src/ska_tango_base/commands.py +++ b/src/ska_tango_base/commands.py @@ -19,7 +19,7 @@ The following command classes are provided: * **ResponseCommand**: for commands that return a ``(ResultCode, message)`` tuple. - + * **CompletionCommand**: for commands that need to let their state machine know when they have completed; that is, long-running commands with transitional states, such as ``AssignResources()`` and diff --git a/src/ska_tango_base/csp/obs/obs_device.py b/src/ska_tango_base/csp/obs/obs_device.py index bc86a53a0b218e808684f237b97fd5044b34f818..a4d9bf49cf7f4f0964d3f4b4ba2a629bb943a73f 100644 --- a/src/ska_tango_base/csp/obs/obs_device.py +++ b/src/ska_tango_base/csp/obs/obs_device.py @@ -218,13 +218,13 @@ class CspSubElementObsDevice(SKAObsDevice): def read_scanID(self): # PROTECTED REGION ID(CspSubElementObsDevice.scanID_read) ENABLED START # """Return the scanID attribute.""" - return self.component_manager.scan_id # pylint: disable=no-member + return self.component_manager.scan_id # PROTECTED REGION END # // CspSubElementObsDevice.scanID_read def read_configurationID(self): # PROTECTED REGION ID(CspSubElementObsDevice.configurationID_read) ENABLED START # """Return the configurationID attribute.""" - return self.component_manager.config_id # pylint: disable=no-member + return self.component_manager.config_id # PROTECTED REGION END # // CspSubElementObsDevice.configurationID_read def read_deviceID(self): diff --git a/src/ska_tango_base/csp/obs/obs_state_model.py b/src/ska_tango_base/csp/obs/obs_state_model.py index e594bd8cfc0429dd2af14a272b89f1a4d4ec521e..b9a8bb478655ff175cfdff0caa45a218c1839274 100644 --- a/src/ska_tango_base/csp/obs/obs_state_model.py +++ b/src/ska_tango_base/csp/obs/obs_state_model.py @@ -8,7 +8,7 @@ comprises: * a :py:class:`.CspSubElementObsStateModel` that maps the underlying state machine state to a value of the :py:class:`ska_tango_base.control_model.ObsState` enum. - + """ from transitions.extensions import LockedMachine as Machine diff --git a/src/ska_tango_base/csp/obs/reference_component_manager.py b/src/ska_tango_base/csp/obs/reference_component_manager.py index 8d367156d26d131f1f79a1a276217a9ae18d6817..220176d1cc354862c6f2e962948fd9f83621b743 100644 --- a/src/ska_tango_base/csp/obs/reference_component_manager.py +++ b/src/ska_tango_base/csp/obs/reference_component_manager.py @@ -3,8 +3,6 @@ This module models component management for CSP subelement observation devices. """ import functools -from tango import DevState - from ska_tango_base.csp.obs import CspObsComponentManager from ska_tango_base.base import check_communicating, ReferenceBaseComponentManager diff --git a/src/ska_tango_base/csp/subarray/subarray_device.py b/src/ska_tango_base/csp/subarray/subarray_device.py index a4affd9b0a0969e5e51d646ef7fb5798c4f5f67e..94cbadc288d85b50b3e122d09ccf2e60b0cccc24 100644 --- a/src/ska_tango_base/csp/subarray/subarray_device.py +++ b/src/ska_tango_base/csp/subarray/subarray_device.py @@ -72,7 +72,9 @@ class CspSubElementSubarray(SKASubarray): dtype="DevString", access=AttrWriteType.READ_WRITE, label="sdpDestinationAddresses", - doc="JSON formatted string.\nReport the list of all the SDP addresses provided by SDP to receive the output products.\nSpecifies the Mac, IP, Port for each resource:CBF visibility channels, Pss pipelines, PSTBeam", + doc="JSON formatted string.\nReport the list of all the SDP addresses provided " + "by SDP to receive the output products.\nSpecifies the Mac, IP, Port for each " + "resource:CBF visibility channels, Pss pipelines, PSTBeam", ) """Device attribute.""" @@ -102,7 +104,9 @@ class CspSubElementSubarray(SKASubarray): listOfDevicesCompletedTasks = attribute( dtype="DevString", label="listOfDevicesCompletedTasks", - doc="JSON formatted string reporting for each task/command the list of devices\nthat completed successfully the task.\nEx.\n{``cmd1``: [``device1``, ``device2``], ``cmd2``: [``device2``, ``device3``]}", + doc="JSON formatted string reporting for each task/command the list of devices" + "\nthat completed successfully the task.\nEx.\n{``cmd1``: [``device1``, " + "``device2``], ``cmd2``: [``device2``, ``device3``]}", ) """Device attribute.""" @@ -309,13 +313,13 @@ class CspSubElementSubarray(SKASubarray): def read_scanID(self): # PROTECTED REGION ID(CspSubElementSubarray.scanID_read) ENABLED START # """Return the scanID attribute.""" - return self.component_manager.scan_id # pylint: disable=no-member + return self.component_manager.scan_id # PROTECTED REGION END # // CspSubElementSubarray.scanID_read def read_configurationID(self): # PROTECTED REGION ID(CspSubElementSubarray.configurationID_read) ENABLED START # """Return the configurationID attribute.""" - return self.component_manager.config_id # pylint: disable=no-member + return self.component_manager.config_id # PROTECTED REGION END # // CspSubElementSubarray.configurationID_read def read_sdpDestinationAddresses(self): diff --git a/src/ska_tango_base/obs/obs_device.py b/src/ska_tango_base/obs/obs_device.py index d9bef7ee0ef502ff55601fd4e11e71be4ccf6fd6..d993a9dcbe175588e4cc3fe5f081bea8b948a498 100644 --- a/src/ska_tango_base/obs/obs_device.py +++ b/src/ska_tango_base/obs/obs_device.py @@ -13,8 +13,6 @@ instead of just SKABaseDevice. # Additional import # PROTECTED REGION ID(SKAObsDevice.additionnal_import) ENABLED START # -import warnings - # Tango imports from tango.server import run, attribute diff --git a/src/ska_tango_base/subarray/reference_component_manager.py b/src/ska_tango_base/subarray/reference_component_manager.py index dd7436eef3baee51925c12f2e2fdc5f969a4afb7..6ca16084809f7b6a41e520080605db4ffe30860a 100644 --- a/src/ska_tango_base/subarray/reference_component_manager.py +++ b/src/ska_tango_base/subarray/reference_component_manager.py @@ -3,8 +3,6 @@ This module models component management for SKA subarray devices. """ import functools -from tango import DevState - from ska_tango_base.subarray import SubarrayComponentManager from ska_tango_base.base import ( check_communicating, diff --git a/src/ska_tango_base/subarray/subarray_device.py b/src/ska_tango_base/subarray/subarray_device.py index 6b4d95301cf2100b28d1655572f69548891d7b25..61e5a1257fa2b3c064c23a4d33e764cd67bc2fd3 100644 --- a/src/ska_tango_base/subarray/subarray_device.py +++ b/src/ska_tango_base/subarray/subarray_device.py @@ -12,7 +12,6 @@ information like assigned resources, configured capabilities, etc. """ # PROTECTED REGION ID(SKASubarray.additionnal_import) ENABLED START # import json -import warnings from tango import DebugIt from tango.server import run, attribute, command @@ -295,7 +294,7 @@ class SKASubarray(SKAObsDevice): component_manager = self.target component_manager.scan(argin) - message = f"Scan command started" + message = "Scan command started" self.logger.info(message) return (ResultCode.STARTED, message) @@ -639,7 +638,7 @@ class SKASubarray(SKAObsDevice): :return: Resources assigned to the device. """ - return self.component_manager.assigned_resources # pylint: disable=no-member + return self.component_manager.assigned_resources # PROTECTED REGION END # // SKASubarray.assignedResources_read def read_configuredCapabilities(self): @@ -650,9 +649,7 @@ class SKASubarray(SKAObsDevice): :return: A list of capability types with no. of instances used in the Subarray """ - return ( - self.component_manager.configured_capabilities # pylint: disable=no-member - ) + return self.component_manager.configured_capabilities # PROTECTED REGION END # // SKASubarray.configuredCapabilities_read # -------- diff --git a/src/ska_tango_base/subarray/subarray_obs_state_model.py b/src/ska_tango_base/subarray/subarray_obs_state_model.py index 5562a67624478da2d70f664a1144fdb5d3202632..76de3042a4451b0a0c424a1a4e4d4e490b8a276a 100644 --- a/src/ska_tango_base/subarray/subarray_obs_state_model.py +++ b/src/ska_tango_base/subarray/subarray_obs_state_model.py @@ -7,7 +7,7 @@ subarray Tango devices. It consists of: * an :py:class:`.SubarrayObsStateModel` that maps the underlying state machine state to a value of the :py:class:`ska_tango_base.control_model.ObsState` enum. - + """ from transitions.extensions import LockedMachine as Machine diff --git a/tests/conftest.py b/tests/conftest.py index 84108f5b024315e0f6e5d796da10136b92147fec..5dfbbd92010752d8a1e874c2f80824cd58eb6f11 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,7 +1,6 @@ """ A module defining a list of fixtures that are shared across all ska_tango_base tests. """ -import importlib import logging from queue import Empty, Queue diff --git a/tests/test_alarm_handler_device.py b/tests/test_alarm_handler_device.py index af8366d4b6427635fb3693858ba7ebf465b0c1cf..8aaffda8837d08d9c889a64751b238575d0f244d 100644 --- a/tests/test_alarm_handler_device.py +++ b/tests/test_alarm_handler_device.py @@ -17,12 +17,15 @@ from ska_tango_base import SKAAlarmHandler from ska_tango_base.base import ReferenceBaseComponentManager from ska_tango_base.control_model import AdminMode + # PROTECTED REGION ID(SKAAlarmHandler.test_additional_imports) ENABLED START # # PROTECTED REGION END # // SKAAlarmHandler.test_additional_imports # Device test case # PROTECTED REGION ID(SKAAlarmHandler.test_SKAAlarmHandler_decorators) ENABLED START # -@pytest.mark.usefixtures("tango_context", "initialize_device") # PROTECTED REGION END # // SKAAlarmHandler.test_SKAAlarmHandler_decorators + + +@pytest.mark.usefixtures("tango_context", "initialize_device") class TestSKAAlarmHandler(object): """ Test class for tests of the SKAAlarmHander device class. diff --git a/tests/test_csp_subarray.py b/tests/test_csp_subarray.py index f9fc45837da2768ea2e5e7ef0cfcc01f1f9c2065..22cffd03e0fe3d5516d496f8612ddba8dd1270f2 100644 --- a/tests/test_csp_subarray.py +++ b/tests/test_csp_subarray.py @@ -294,7 +294,7 @@ class TestCspSubElementSubarray(object): def test_configureScanTimeoutExpiredFlag(self, tango_context): """Test for timeoutExpiredFlag""" # PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag) ENABLED START # - assert tango_context.device.configureScanTimeoutExpiredFlag == False + assert not tango_context.device.configureScanTimeoutExpiredFlag # PROTECTED REGION END # // CspSubelementSubarray.test_timeoutExpiredFlag # PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag_decorators) ENABLED START # @@ -302,7 +302,7 @@ class TestCspSubElementSubarray(object): def test_assignResourcesTimeoutExpiredFlag(self, tango_context): """Test for timeoutExpiredFlag""" # PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag) ENABLED START # - assert tango_context.device.assignResourcesTimeoutExpiredFlag == False + assert not tango_context.device.assignResourcesTimeoutExpiredFlag # PROTECTED REGION END # // CspSubelementSubarray.test_timeoutExpiredFlag # PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag_decorators) ENABLED START # @@ -310,7 +310,7 @@ class TestCspSubElementSubarray(object): def test_releaseResourcesTimeoutExpiredFlag(self, tango_context): """Test for timeoutExpiredFlag""" # PROTECTED REGION ID(CspSubelementSubarray.test_timeoutExpiredFlag) ENABLED START # - assert tango_context.device.releaseResourcesTimeoutExpiredFlag == False + assert not tango_context.device.releaseResourcesTimeoutExpiredFlag # PROTECTED REGION END # // CspSubelementSubarray.test_timeoutExpiredFlag # PROTECTED REGION ID(CspSubelementSubarray.test_ConfigureScan_decorators) ENABLED START #