Commit 8d9cfb08 authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

Merge branch 'fix-problem-integration-ADR8' into 'master' 

Fix problem integration adr8

See merge request ska-telescope/csp-lmc!7
parents e2efb2fc d413bfa2

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -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

csp-lmc-common/.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -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

csp-lmc-common/HISTORY

+6 −0
Original line number Diff line number Diff line 
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.

csp-lmc-common/csp_lmc_common/CspSubarray.py

+4 −2
Original line number Diff line number Diff line
@@ -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

csp-lmc-common/csp_lmc_common/release.py

+1 −1
Original line number Diff line number Diff line
@@ -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"