Commit 3ad41444 authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

AT5-382: csp-lmc-mid project - Moved logger.warn (deprecated) to logger.warning.

Update release information.
parent 2a1224f5
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ class MidCspSubarrayBase(CspSubarray):
                # numpy array
                receptors = device_proxy.receptors
            except tango.DevFailed as tango_err:
                self.logger.warn("__monitor_add_receptors:",
                                 tango_err.args[0].desc)
                self.logger.warning("__monitor_add_receptors:{}".format(tango_err.args[0].desc))
            if len(receptors):
                # get the ids in receptor_list that are also in receptor
                receptors_assigned = [value for value in receptor_list if value in receptors]
@@ -109,7 +108,7 @@ class MidCspSubarrayBase(CspSubarray):
                    self._sc_subarray_cmd_exec_state[device][cmd_name] == CmdExecState.TIMEOUT):
                msg = ("Timeout executing {} command  on device {}".format(
                    cmd_name, device))
                self.logger.warn(msg)
                self.logger.warning(msg)
                self._sc_subarray_cmd_exec_state[device][cmd_name] = CmdExecState.TIMEOUT
                break
            # update the progress counter inside the loop taking into account the number of devices
@@ -125,7 +124,7 @@ class MidCspSubarrayBase(CspSubarray):
        if self._sc_subarray_state[self.CbfSubarray] != tango.DevState.ON:
            msg = ("AddReceptors: device {} is in {}"
                   " State".format(device, self._sc_subarray_state[self.CbfSubarray]))
            self.logger.warn(msg)
            self.logger.warning(msg)
        if self._sc_subarray_cmd_exec_state[device][cmd_name] == CmdExecState.TIMEOUT:
            self._timeout_expired = True
        # reset the command execution state
@@ -149,7 +148,7 @@ class MidCspSubarrayBase(CspSubarray):
            try:
                receptors = device_proxy.receptors
            except AttributeError as attr_err:
                self.logger.warn("RemoveReceptors:{}".format(str(attr_err)))
                self.logger.warning("RemoveReceptors:{}".format(str(attr_err)))
            if len(receptors):
                # get the ids in receptor_list that are no more present in receptors
                receptors_removed = [
@@ -178,7 +177,7 @@ class MidCspSubarrayBase(CspSubarray):
                    self._sc_subarray_cmd_exec_state[device][cmd_name] == CmdExecState.TIMEOUT):
                msg = ("Timeout executing {} command  on device {}".format(
                    cmd_name, device))
                self.logger.warn(msg)
                self.logger.warning(msg)
                self._sc_subarray_cmd_exec_state[device][cmd_name] = CmdExecState.TIMEOUT
                break
            # update the progress counter inside the loop taking into account the number of devices
@@ -196,7 +195,7 @@ class MidCspSubarrayBase(CspSubarray):
                                                             tango.DevState.ON]:
            self._failure_message[cmd_name] += ("Device {} is in {} State".format(device,
                                                                                self._sc_subarray_state[self.CbfSubarray]))
            self.logger.warn(self._failure_message[device])
            self.logger.warning(self._failure_message[device])
            self._failure_raised = True
        if self._sc_subarray_cmd_exec_state[device][cmd_name] == CmdExecState.TIMEOUT:
            self._timeout_expired = True
@@ -394,6 +393,7 @@ class MidCspSubarrayBase(CspSubarray):
        destructor and by the device Init command.
        """
        # PROTECTED REGION ID(MidCspSubarrayBase.delete_device) ENABLED START #
        CspSubarray.delete_device(self)
        # PROTECTED REGION END #    //  MidCspSubarrayBase.delete_device
    # ------------------
    # Attributes methods
@@ -443,7 +443,7 @@ class MidCspSubarrayBase(CspSubarray):
                # build the list of the installed receptors
                self._receptor_id_list = list(self._receptor_to_vcc_map.keys())
            except tango.DevFailed as tango_err:
                self.logger.warn(tango_err.args[0].desc)
                self.logger.warning(tango_err.args[0].desc)
        try:
            assigned_receptors = self._sc_subarray_proxies[self.CbfSubarray].receptors
            # NOTE: if receptors attribute is empty, assigned_receptors is an empty numpy array
@@ -530,7 +530,7 @@ class MidCspSubarrayBase(CspSubarray):
            if not any(available_receptors):
                log_msg = "No available receptor to add to subarray {}".format(
                    self.SubID)
                self.logger.warn(log_msg)
                self.logger.warning(log_msg)
                return
            receptor_membership = csp_master_proxy.receptorMembership
        except tango.DevFailed as df:
@@ -558,7 +558,7 @@ class MidCspSubarrayBase(CspSubarray):
                    self.logger.info(log_msg)
            else:
                log_msg = "Invalid receptor id: {}".format(str(receptorId))
                self.logger.warn(log_msg)
                self.logger.warning(log_msg)

        # check if the list of receptors to assign is empty
        if not receptor_to_assign:
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@
"""Release information for Python Package"""

name = """mid-csp-lmc"""
version = "0.5.0"
version = "0.5.1"
version_info = version.split(".")
description = """SKA MID CSP.LMC"""
author = "INAF-OAA"
+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
"""Release information for Python Package"""

name = """MID CSP.LMC"""
version = "0.5.0"
version = "0.5.1"
version_info = version.split(".")
description = """SKA MID CSP.LMC Classes"""
author = "E.G"
@@ -18,5 +18,5 @@ license = """BSD-3-Clause"""
url = """www.tango-controls.org"""
copyright = """"""

release=0.5.0
tag=mid-csp-lmc-0.5.0
release=0.5.1
tag=mid-csp-lmc-0.5.1