From ec5f57ed7ecf5cc0fb96e3d45fa816079ac3285b Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Fri, 28 Oct 2022 10:54:31 +0000
Subject: [PATCH] L2SS-983: Align version information
---
deploy/deploy.yml | 19 ++++++-------------
tangostationcontrol/VERSION | 2 +-
.../clients/comms_client.py | 4 ++--
.../default/statistics/test_writer_sst.py | 2 +-
4 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/deploy/deploy.yml b/deploy/deploy.yml
index 994487bb4..455c9da59 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 0d91a54c7..9e11b32fc 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 cfa989439..0188753a2 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 89eb31d8e..90c1c9161 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):
--
GitLab