diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b04c8d841f54160b999b94fdb4450c4e48092e8..3a4366d2502abea15bd105fb75a4783955375683 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,9 +70,9 @@ pages: MIDCSP_PATH: csp-lmc-mid/docker script: - pwd - - pip3 install junitparser + - python3 -m pip install junitparser #update coverage o the last release - - pip3 install --upgrade coverage + - python3 -m pip install --upgrade coverage - ls -lR # copy the content of packages folders in public # path to all files is relative to the repository diff --git a/csp-lmc-common/.gitlab-ci.yml b/csp-lmc-common/.gitlab-ci.yml index 53278dd662c1fb4c5ddbd3d313fcf259a1abcdad..0be7f45cd66221f8db76f129d5d9d99cf511b246 100644 --- a/csp-lmc-common/.gitlab-ci.yml +++ b/csp-lmc-common/.gitlab-ci.yml @@ -20,13 +20,13 @@ dependencies: [] script: - cd $COMMON_BUILD_PATH - - python setup.py egg_info -b+dev.$CI_COMMIT_SHORT_SHA sdist bdist_wheel + - python3 setup.py egg_info -b+dev.$CI_COMMIT_SHORT_SHA sdist bdist_wheel .build_python_release_common: extends: .build_python_common script: - cd $COMMON_BUILD_PATH - - python setup.py egg_info -b+$CI_COMMIT_SHORT_SHA sdist bdist_wheel + - python3 setup.py egg_info -b+$CI_COMMIT_SHORT_SHA sdist bdist_wheel build:csp-lmc-common_pkg_dev: # Executed on a commit extends: .build_python_dev_common @@ -107,7 +107,7 @@ linting:csp-lmc-common: tags: - docker-executor before_script: - - pip install twine + - python3 -m pip install twine .publish_python_dev_common: extends: .publish_python_common diff --git a/csp-lmc-common/HISTORY b/csp-lmc-common/HISTORY index e80e0949c39595c27f827bc75e812bd2b3b2d605..e2cb2ec4bcc80e94eee614e0f430cffe4c8847e2 100644 --- a/csp-lmc-common/HISTORY +++ b/csp-lmc-common/HISTORY @@ -1,3 +1,9 @@ +0.6.9: + - use lmcbaseclasses 0.6.5 +0.6.8: +- Removed the CspSubarrayStateModel: no more used. This state model was not correct becuase it + did not register the callback to push events on obsState attribute + 0.6.7: - Fixed a bug in re-configuration process. diff --git a/csp-lmc-common/csp_lmc_common/CspSubarray.py b/csp-lmc-common/csp_lmc_common/CspSubarray.py index 1c30d2853d4e976a1875af31a1a8a2db6dd29345..d81b5355502e1218da2d9272e3508e59ee7c956c 100644 --- a/csp-lmc-common/csp_lmc_common/CspSubarray.py +++ b/csp-lmc-common/csp_lmc_common/CspSubarray.py @@ -46,6 +46,7 @@ from . import release # PROTECTED REGION END # // CspSubarray.additionnal_import __all__ = ["CspSubarray", "main"] +''' class CspSubarrayStateModel(SKASubarrayStateModel): _subarray_transitions = { ('READY', 'goto_idle_succeeded'): ( @@ -68,6 +69,7 @@ class CspSubarrayStateModel(SKASubarrayStateModel): dev_state_callback=dev_state_callback, ) self.update_transitions(self._subarray_transitions) +''' class CspSubarray(SKASubarray): """ @@ -1768,7 +1770,7 @@ class CspSubarray(SKASubarray): # ---------------- # Class private methods # ---------------- - + ''' def _init_state_model(self): """ Sets up the state model for the device @@ -1776,7 +1778,7 @@ class CspSubarray(SKASubarray): self.state_model = CspSubarrayStateModel( dev_state_callback=self._update_state, ) - + ''' def init_command_objects(self): """ Sets up the command objects diff --git a/csp-lmc-common/csp_lmc_common/release.py b/csp-lmc-common/csp_lmc_common/release.py index 943c7ab5bc0ec97bcd66e1e65e0686900fcbb8ad..dd592c52b88f209df8fa28c134e1efb5a317791e 100755 --- a/csp-lmc-common/csp_lmc_common/release.py +++ b/csp-lmc-common/csp_lmc_common/release.py @@ -10,7 +10,7 @@ """Release information for Python Package""" name = """csp-lmc-common""" -version = "0.6.7" +version = "0.6.9" version_info = version.split(".") description = """SKA CSP.LMC Common Software""" author = "INAF-OAA" diff --git a/csp-lmc-common/docker/.release b/csp-lmc-common/docker/.release index e1074bc162d01644502531ef9a21e9cbd7cfe391..c85422961e2c6a0ff421b33870165d49a06ab20f 100644 --- a/csp-lmc-common/docker/.release +++ b/csp-lmc-common/docker/.release @@ -9,7 +9,7 @@ """Release information for Python Package""" name = """csplmc-common""" -version = "0.6.7" +version = "0.6.9" version_info = version.split(".") description = """SKA CSP.LMC Common Classe""" author = "E.G" @@ -18,5 +18,5 @@ license = """BSD-3-Clause""" url = """www.tango-controls.org""" copyright = """""" -release=0.6.7 -tag=csp-lmc-common-0.6.7 +release=0.6.9 +tag=csp-lmc-common-0.6.9 diff --git a/csp-lmc-common/setup.py b/csp-lmc-common/setup.py index 60e4213adb29a0290841375d67a2c756d9cc3673..f0281d564d7d1acf1b6e949b3940954d222a10cb 100644 --- a/csp-lmc-common/setup.py +++ b/csp-lmc-common/setup.py @@ -38,7 +38,7 @@ setup( install_requires = [ 'pytango >9.3.1', 'future', - 'lmcbaseclasses==0.6.3' + 'lmcbaseclasses==0.6.5+221be16f' ], setup_requires=[ 'pytest-runner', diff --git a/csp-lmc-mid/.gitlab-ci.yml b/csp-lmc-mid/.gitlab-ci.yml index 32d1d5ca28f0a1756ff0f2a3fb4e81878678c49d..1b8306a6c21b38c7311b3a123894b1c5f7227726 100644 --- a/csp-lmc-mid/.gitlab-ci.yml +++ b/csp-lmc-mid/.gitlab-ci.yml @@ -19,13 +19,13 @@ dependencies: [] script: - cd $BUILD_PATH - - python setup.py egg_info -b+dev.$CI_COMMIT_SHORT_SHA sdist bdist_wheel + - python3 setup.py egg_info -b+dev.$CI_COMMIT_SHORT_SHA sdist bdist_wheel .build_python_release: extends: .build_python script: - cd $BUILD_PATH - - python setup.py egg_info -b+$CI_COMMIT_SHORT_SHA sdist bdist_wheel + - python3 setup.py egg_info -b+$CI_COMMIT_SHORT_SHA sdist bdist_wheel build:csp-lmc-mid_pkg_dev: # Executed on a commit extends: .build_python_dev @@ -122,7 +122,7 @@ linting:csp-lmc-mid: tags: - docker-executor before_script: - - pip install twine + - python3 -m pip install twine .publish_python_dev: extends: .publish_python diff --git a/csp-lmc-mid/HISTORY b/csp-lmc-mid/HISTORY index 65352934ae486b64865f4e903863006af23afadd..4de4f759ca2cb413ffae8f26b27b73b91aa67d4f 100644 --- a/csp-lmc-mid/HISTORY +++ b/csp-lmc-mid/HISTORY @@ -1,3 +1,11 @@ +0.6.9: +- use csp-lmc-common 0.6.9 +- fix bug in receptor class + +0.6.8: +- use csp-lmc-common version 0.6.8. +- removed import of CspSubarrayStateModel + 0.6.7: - use csp-lmc-common version 0.6.7 diff --git a/csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py b/csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py index 65d64212042da95f7a914f4906c1be7101ad6a29..21e65a4fb740be6229db438a8725024d7ad3784e 100644 --- a/csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py +++ b/csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py @@ -38,15 +38,14 @@ from tango import AttrQuality, EventType, DevState from tango import AttrWriteType, DeviceProxy # Additional import # PROTECTED REGION ID(MidCspSubarray.additional_import) ENABLED START # -#from ska.base import SKAMaster from ska.base import SKASubarray, SKASubarrayStateModel from ska.base.commands import ActionCommand, ResponseCommand, ResultCode from ska.base.faults import CapabilityValidationError from ska.base.control_model import HealthState, AdminMode, ObsState # import CSP.LMC Common package from csp_lmc_common.utils.cspcommons import CmdExecState -#from csp_lmc_common.utils.decorators import AdminModeCheck, ObsStateCheck, SubarrayRejectCmd -from csp_lmc_common.CspSubarray import CspSubarray, CspSubarrayStateModel +#from csp_lmc_common.CspSubarray import CspSubarray, CspSubarrayStateModel +from csp_lmc_common.CspSubarray import CspSubarray from csp_lmc_mid.receptors import Receptors # PROTECTED REGION END # // MidCspSubarrayBase.additionnal_import @@ -759,7 +758,7 @@ class MidCspSubarrayBase(CspSubarray): assigned_receptors = self._receptors.assigned_to_subarray(self.SubID) # NOTE: if receptors attribute is empty, assigned_receptors is an empty numpy array # and it will just be skipped by the for loop - receptor_to_vcc_map = self._receptors.receptor_to_vcc_map + receptor_to_vcc_map = self._receptors.receptor_vcc_map() for receptor_id in assigned_receptors: vcc_id = receptor_to_vcc_map[receptor_id] self._assigned_vcc.append(vcc_id) diff --git a/csp-lmc-mid/csp_lmc_mid/release.py b/csp-lmc-mid/csp_lmc_mid/release.py index 182b64f641baf85d9beb7f8988a41dc3408c1053..102b81e728d3b44ff5fed02ca8176eaef992c003 100755 --- a/csp-lmc-mid/csp_lmc_mid/release.py +++ b/csp-lmc-mid/csp_lmc_mid/release.py @@ -10,7 +10,7 @@ """Release information for Python Package""" name = """mid-csp-lmc""" -version = "0.6.7" +version = "0.6.9" version_info = version.split(".") description = """SKA MID CSP.LMC""" author = "INAF-OAA" diff --git a/csp-lmc-mid/docker/.release b/csp-lmc-mid/docker/.release index 8ea3ee67b5055eec8940966af0f2384ea0fe6a1a..f5a4952d08c8729592189000f331068fbf70666d 100644 --- a/csp-lmc-mid/docker/.release +++ b/csp-lmc-mid/docker/.release @@ -9,7 +9,7 @@ """Release information for Python Package""" name = """MID CSP.LMC""" -version = "0.6.7" +version = "0.6.9" 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.6.7 -tag=mid-csp-lmc-0.6.7 +release=0.6.9 +tag=mid-csp-lmc-0.6.9 diff --git a/csp-lmc-mid/setup.py b/csp-lmc-mid/setup.py index 6bd6066b87b2199339bc26f78e1d02a53f632b30..34a15bd88ecd58136b49c0f1cc7d65abbe6271e1 100644 --- a/csp-lmc-mid/setup.py +++ b/csp-lmc-mid/setup.py @@ -38,7 +38,7 @@ setup( install_requires = [ 'pytango >=9.3.1', 'future', - 'csp-lmc-common>=0.6.7' + 'csp-lmc-common>=0.6.9' ], setup_requires=[ 'pytest-runner', diff --git a/csp-lmc-mid/tests/MidCspSubarray_test.py b/csp-lmc-mid/tests/MidCspSubarray_test.py index 4be0328a823987d438d6f9cddba474babbbde59b..fa9713b1cc53d973b2315aee4885905b6b320709 100755 --- a/csp-lmc-mid/tests/MidCspSubarray_test.py +++ b/csp-lmc-mid/tests/MidCspSubarray_test.py @@ -530,7 +530,7 @@ class TestCspSubarray(TestBase): f = open(file_path + "/acceptance_tests/test_ConfigureScan_ADR4.json") (result_code, msg) = self.midcsp_subarray01.Configure(f.read().replace("\n", "")) f.close() - time.sleep(0.1) + #time.sleep(0.1) self.midcsp_subarray01.Abort() # check prober_subarray_obstate = Probe(self.midcsp_subarray01, 'obsState', ObsState.ABORTED, diff --git a/csp-lmc-mid/tests/unit/midcspsubarray_unit_test.py b/csp-lmc-mid/tests/unit/midcspsubarray_unit_test.py index 64be280adb69bce2f29e9ce49b08a5df21bb9785..db56b1d22ab57cbb4d1072a58ad0c743f0832ca8 100644 --- a/csp-lmc-mid/tests/unit/midcspsubarray_unit_test.py +++ b/csp-lmc-mid/tests/unit/midcspsubarray_unit_test.py @@ -717,12 +717,8 @@ def test_midcspsubarray_obsstate_WHEN_abort_invoked_in_resetting(): tango_context.device.ObsReset() prober_obs_state = Probe(tango_context.device, 'obsState', ObsState.RESETTING, f"Wrong CspSubarray state") Poller(3, 0.1).check(prober_obs_state) - with pytest.raises(tango.DevFailed) as df: - tango_context.device.Abort() - if df: - err_msg = str(df.value.args[0].desc) - assert "Error executing command AbortCommand" in err_msg - prober_obs_state = Probe(tango_context.device, 'obsState', ObsState.FAULT, f"Wrong CspSubarray state") + tango_context.device.Abort() + prober_obs_state = Probe(tango_context.device, 'obsState', ObsState.ABORTING, f"Wrong CspSubarray state") Poller(3, 0.1).check(prober_obs_state) def test_midcspsubarray_obsstate_WHEN_restart_invoked_after_cspsubarray_aborted():