From ad0dc271bedc03d90f0a47f0513ae55102fd593c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brigitta=20Sip=C5=91cz?= Date: Wed, 18 Dec 2024 19:51:04 -0800 Subject: [PATCH 1/3] BUG: get_member_observations should return list not MaskedColumn --- astroquery/esa/hubble/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astroquery/esa/hubble/core.py b/astroquery/esa/hubble/core.py index cae9050401..fdb554913a 100644 --- a/astroquery/esa/hubble/core.py +++ b/astroquery/esa/hubble/core.py @@ -299,7 +299,7 @@ def _select_related_members(self, observation_id): def _select_related_composite(self, observation_id): query = f"select observation_id from ehst.observation where members like '%{observation_id}%'" job = self.query_tap(query=query) - oids = job["observation_id"] + oids = job["observation_id"].tolist() return oids def __validate_product_type(self, product_type): From 9406e3919a1bd59a41b0fd76b1ab1ab4187b099b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brigitta=20Sip=C5=91cz?= Date: Wed, 18 Dec 2024 19:52:41 -0800 Subject: [PATCH 2/3] TST: update test that now returns the expected multiple elements for the composite --- astroquery/esa/hubble/tests/test_esa_hubble_remote.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/astroquery/esa/hubble/tests/test_esa_hubble_remote.py b/astroquery/esa/hubble/tests/test_esa_hubble_remote.py index d9db5f3350..abbe5ea050 100644 --- a/astroquery/esa/hubble/tests/test_esa_hubble_remote.py +++ b/astroquery/esa/hubble/tests/test_esa_hubble_remote.py @@ -103,7 +103,9 @@ def test_hap_composite_to_hap_simple(self): def test_hap_simple_to_hap_composite(self): result = esa_hubble.get_member_observations(observation_id='hst_16316_71_acs_sbc_f150lp_jec071i9') - assert result == ['hst_16316_71_acs_sbc_f150lp_jec071'] + assert result == ['hst_16316_71_acs_sbc_f150lp_jec071', + 'hst_16316_71_acs_sbc_total_jec071', + 'hst_skycell-p2478x15y09_acs_sbc_f150lp_all'] def test_hap_simple_to_hst_simple(self): result = esa_hubble.get_hap_hst_link(observation_id='hst_16316_71_acs_sbc_f150lp_jec071i9') From 4ddac23da258eb32eee39376d15f32cac2f169fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brigitta=20Sip=C5=91cz?= Date: Wed, 18 Dec 2024 19:55:21 -0800 Subject: [PATCH 3/3] DOC: adding changelog --- CHANGES.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 0a95d9945c..c6bc44207f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -31,11 +31,14 @@ casda - Support jobs which are in the SUSPENDED state (used when copying data) [#3134] -ehst -^^^^ +esa.hubble +^^^^^^^^^^ - Include warning in get_datalabs_path method for ehst when the data volume is not mounted in DataLabs [#3059] +- Fix an inconsistency, ``get_member_observations`` now return a list for + both simple and composite observations. [#3157] + gama ^^^^