diff --git a/tangostationcontrol/tangostationcontrol/devices/observation.py b/tangostationcontrol/tangostationcontrol/devices/observation.py index 8d56f9ed06c37d9727a71a78d056567f066031e9..eede30416302ef818188ff173204b197cad9935d 100644 --- a/tangostationcontrol/tangostationcontrol/devices/observation.py +++ b/tangostationcontrol/tangostationcontrol/devices/observation.py @@ -54,7 +54,7 @@ class Observation(LOFARDevice): antenna_mask_R = attribute( dtype=(numpy.int64,), max_dim_x=MAX_ANTENNA, access=AttrWriteType.READ ) - filter_R = attribute(dtype=numpy.str, access=AttrWriteType.READ) + filter_R = attribute(dtype=str, access=AttrWriteType.READ) saps_subband_R = attribute( dtype=((numpy.uint32,),), max_dim_x=N_beamlets_ctrl, @@ -62,13 +62,13 @@ class Observation(LOFARDevice): access=AttrWriteType.READ, ) saps_pointing_R = attribute( - dtype=((numpy.str,),), + dtype=((str,),), max_dim_x=N_point_prop, max_dim_y=N_beamlets_ctrl, access=AttrWriteType.READ, ) tile_beam_R = attribute( - dtype=(numpy.str,), max_dim_x=N_point_prop, access=AttrWriteType.READ + dtype=(str,), max_dim_x=N_point_prop, access=AttrWriteType.READ ) first_beamlet_R = attribute(dtype=numpy.int64, access=AttrWriteType.READ) diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/prometheus/test_tango_prometheus_client.py b/tangostationcontrol/tangostationcontrol/integration_test/default/prometheus/test_tango_prometheus_client.py index d7e2aa83570831d256a8c881e484e196318134fb..7d35b331b48be5056de14ebc58a6d30ff53383a4 100644 --- a/tangostationcontrol/tangostationcontrol/integration_test/default/prometheus/test_tango_prometheus_client.py +++ b/tangostationcontrol/tangostationcontrol/integration_test/default/prometheus/test_tango_prometheus_client.py @@ -145,7 +145,7 @@ class TestPrometheusClient(BaseIntegrationTestCase): for s in metric_samples: if s.labels["name"] == "ANT_error_R": # NB: this does flatten the array, as we ignore the x/y labels - samples_values.append(numpy.bool(s.value)) + samples_values.append(bool(s.value)) numpy.testing.assert_equal(samples_values, expected_attr_values.flatten()) # Test scraping metrics total_scraping_time = scraping_metrics.samples[-1].value