diff --git a/deploy/deploy.yml b/deploy/deploy.yml index 994487bb45b2bbae9a656abd831a76153b5742c6..455c9da59ea78e724dc448e476df8fffa0ff6522 100644 --- a/deploy/deploy.yml +++ b/deploy/deploy.yml @@ -24,14 +24,7 @@ failed_when: tango_directory.rc not in [0,1] register: tango_directory - name: Register pending changes - shell: | - git status | grep Changes - ret=$? - echo $ret - if [ $ret -eq 0 ]; then - exit 1 - fi - exit 0 + shell: "! (git status | grep Changes)" args: chdir: "{{ install_path }}" changed_when: false @@ -53,11 +46,11 @@ shell: "make stop" args: chdir: "{{ install_path }}/docker-compose" -# - name: Git Fetch All -# changed_when: false -# shell: "git fetch --all" -# args: -# chdir: "{{ install_path }}" + - name: Git Fetch All + changed_when: false + shell: "git fetch --all" + args: + chdir: "{{ install_path }}" - name: Update Sources changed_when: false shell: "git checkout {{ station_version }}" diff --git a/tangostationcontrol/VERSION b/tangostationcontrol/VERSION index 0d91a54c7d439e84e3dd17d3594f1b2b6737f430..9e11b32fcaa96816319e5d0dcff9fb2873f04061 100644 --- a/tangostationcontrol/VERSION +++ b/tangostationcontrol/VERSION @@ -1 +1 @@ -0.3.0 +0.3.1 diff --git a/tangostationcontrol/tangostationcontrol/clients/comms_client.py b/tangostationcontrol/tangostationcontrol/clients/comms_client.py index cfa989439a2c12317a895f4f1a83618ca42c9bf9..0188753a2f6ca1d439873903d9b8d021dcc7ee62 100644 --- a/tangostationcontrol/tangostationcontrol/clients/comms_client.py +++ b/tangostationcontrol/tangostationcontrol/clients/comms_client.py @@ -15,12 +15,12 @@ class AbstractCommClient(ABC): def stop(self): """ Stop communication with the client. """ - @abstractmethod - def ping(self): + def ping(self): # noqa: B027 """ Check whether the connection is still alive. Clients that override this method must raise an Exception if the connection died. """ + pass @abstractmethod def setup_attribute(self, annotation, attribute): diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/statistics/test_writer_sst.py b/tangostationcontrol/tangostationcontrol/integration_test/default/statistics/test_writer_sst.py index 89eb31d8ef6db7f74345aab8b0ba7bf35de741e1..90c1c9161908ba8bd2724e364c0e0c500cce29df 100644 --- a/tangostationcontrol/tangostationcontrol/integration_test/default/statistics/test_writer_sst.py +++ b/tangostationcontrol/tangostationcontrol/integration_test/default/statistics/test_writer_sst.py @@ -82,7 +82,7 @@ class TestStatisticsWriterSST(BaseIntegrationTestCase): '2021-09-20T12:17:40.000+00:00' ) self.assertIsNotNone(stat) - self.assertEqual("0.2.0", stat.station_version_id) + self.assertEqual("0.3.1", stat.station_version_id) self.assertEqual("0.1", stat.writer_version_id) def test_insert_tango_SST_statistics(self):