diff --git a/README.md b/README.md index 366d0392dbdd6cd7149f294cfb3a3214688604f0..6fce2937ebbc4c94d4a556e06cb568273cc90fa8 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,7 @@ tox -e debug tests.requests.test_prometheus ## Release notes +- 0.18.5 - Compatability with python 3.10 and higher - 0.18.4 - Compatability with PyTango 9.5.0 - 0.18.3 - Refactoring statistics packets. Moving tango to optional dependency `[tango]` - 0.18.2 - Bugfix when closing unused HDF5 files diff --git a/VERSION b/VERSION index 267d7e011feae65732d5714726d601dbf9032289..543466e4da59849f628c043ae247021c96d88dc9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.18.3 +0.18.5 diff --git a/integration/base.py b/integration/base.py index 689be23b64ace108787b8a6533fb36205ed97560..ffa0493bdb25e73159b6e3187d5e3e54d0e7ff05 100644 --- a/integration/base.py +++ b/integration/base.py @@ -14,7 +14,6 @@ import unittest import testscenarios -import asynctest class BaseTestCase(testscenarios.WithScenarios, unittest.TestCase): @@ -31,7 +30,7 @@ class TestCase(BaseTestCase): super().setUp() -class AsyncTestCase(testscenarios.WithScenarios, asynctest.TestCase): +class AsyncTestCase(testscenarios.WithScenarios, unittest.IsolatedAsyncioTestCase): """Test case base class for all asyncio unit tests.""" def setUp(self): diff --git a/lofar_station_client/observation/station_observation_future.py b/lofar_station_client/observation/station_observation_future.py index 2dc7f0052800aea5bd9ca1162b1334d6ad423ff7..6c22575b2b73799beb5d8412643487c7a6fdc601 100644 --- a/lofar_station_client/observation/station_observation_future.py +++ b/lofar_station_client/observation/station_observation_future.py @@ -64,6 +64,8 @@ class StationObservationFuture: self._control_proxy = DeviceProxy( f"tango://{self.host}/{OBSERVATION_CONTROL_DEVICE_NAME}" ) + # Increase timeout + self._control_proxy.set_timeout_millis(10000) # gives an exception when it fails to ping the proxy _ = self._control_proxy.ping() @@ -136,12 +138,13 @@ class StationObservationFuture: for observation_field in self._specification["antenna_fields"]: antenna_field = observation_field["antenna_field"] self._antenna_fields.append(antenna_field) - self._observation_field_proxies.append( - DeviceProxy( - f"tango://{self.host}/{OBSERVATION_FIELD_DEVICE_NAME}/" - f"{self._id}-{antenna_field}" - ) + field_proxy = DeviceProxy( + f"tango://{self.host}/{OBSERVATION_FIELD_DEVICE_NAME}/" + f"{self._id}-{antenna_field}" ) + # Increase timeout + field_proxy.set_timeout_millis(10000) + self._observation_field_proxies.append(field_proxy) except DevFailed as ex: self._observation_field_proxies = None raise ex diff --git a/setup.cfg b/setup.cfg index 51a18ca4562af1bcca34e79a087d56300e0f88c4..dc94a253735956970ac2b702c7a963a8278a51a5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,8 +19,6 @@ classifiers = Programming Language :: Python Programming Language :: Python :: 3 Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 @@ -31,7 +29,7 @@ classifiers = [options] include_package_data = true packages = find: -python_requires = >=3.7 +python_requires = >=3.9 install_requires = file: requirements.txt [options.extras_require] diff --git a/test-requirements.txt b/test-requirements.txt index cd5b67b0a61f871e8b00bcab2a43c12ef05f1c6e..3802558635f82711c9f269d0652483c4bb99f2bb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,6 @@ autopep8>=1.7.0 # MIT coverage!=4.4,>=4.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 testtools>=2.2.0 # MIT -asynctest>=0.13.0 # Apache-2.0 testscenarios>=0.5.0 # Apache-2.0/BSD pytz>=2022.6 # MIT psutil>=5.9.4 # BSD diff --git a/tests/base.py b/tests/base.py index 689be23b64ace108787b8a6533fb36205ed97560..ffa0493bdb25e73159b6e3187d5e3e54d0e7ff05 100644 --- a/tests/base.py +++ b/tests/base.py @@ -14,7 +14,6 @@ import unittest import testscenarios -import asynctest class BaseTestCase(testscenarios.WithScenarios, unittest.TestCase): @@ -31,7 +30,7 @@ class TestCase(BaseTestCase): super().setUp() -class AsyncTestCase(testscenarios.WithScenarios, asynctest.TestCase): +class AsyncTestCase(testscenarios.WithScenarios, unittest.IsolatedAsyncioTestCase): """Test case base class for all asyncio unit tests.""" def setUp(self): diff --git a/tox.ini b/tox.ini index af7f0597a44151bc8366565135f79a3e803a064d..5413b95f1056d2ec858fd1801f25abb66746c3de 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] min_version = 4.3.3 # Generative environment list to test all supported Python versions -envlist = black,pep8,pylint,py3{7,8,9,10,11,12},docs +envlist = black,pep8,pylint,py3{9,10,11,12},docs [testenv] usedevelop = True