Commit 406bc28b authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

CT69-integration-with-cbf: force the lmcbaseclasses version to not use the 0.6.0

parent 3d19ed2e

csp-lmc-common/csp_lmc_common/CspCapabilityMonitor.py

+4 −4
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ class CspCapabilityMonitor(SKABaseDevice): 
                admin_mode_memorized = attribute_properties['adminMode']['__value']

                self._capability_admin_mode[fqdn] = int(admin_mode_memorized[0])

            except KeyError as key_err:

                self.logger.warn("_connect_to_capability: No key {} found.".format(str(key_err)))

                self.logger.warning("_connect_to_capability: No key {} found.".format(str(key_err)))

            try:

                device_proxy = tango.DeviceProxy(fqdn)

                self._capability_proxies[fqdn] = device_proxy
@@ -243,7 +243,7 @@ class CspCapabilityMonitor(SKABaseDevice): 
                                                     stateless=True)

                self._event_id[fqdn].append(ev_id)

            except tango.DevFailed as tango_err:

                self.logger.warn("_connect_to_capability: {}.".format(tango_err.args[0].desc))

                self.logger.warning("_connect_to_capability: {}.".format(tango_err.args[0].desc))

                

    def _attributes_change_event_cb(self, evt):

        dev_name = evt.device.dev_name()
@@ -284,7 +284,7 @@ class CspCapabilityMonitor(SKABaseDevice): 
                    self._capability_admin_mode[dev_name] = AdminMode.NOT_FITTED

                    self._capability_health_state[dev_name] = ObsState.IDLE

                log_msg = item.reason + ": on attribute " + str(evt.attr_name)

                self.logger.warn(log_msg)

                self.logger.warning(log_msg)

                

    def always_executed_hook(self):

        """Method always executed before any TANGO command is executed."""
@@ -320,7 +320,7 @@ class CspCapabilityMonitor(SKABaseDevice): 
                    self._event_id[fqdn].remove(k)

                if self._event_id[fqdn]:

                    msg = "Still subscribed events: {}".format(self._event_id)

                    self.logger.warn(msg)

                    self.logger.warning(msg)

                else:

                    # remove the dictionary element

                    self._event_id.pop(fqdn)

csp-lmc-common/setup.py

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ setup( 
        install_requires = [

            'pytango >=9.3.1',

            'future',

            'lmcbaseclasses  > 0.5.1',

            'lmcbaseclasses==0.5.4+d12da018',

        ],

        setup_requires=[

            'pytest-runner',