Deprecate unused kwargs, cleanup tests

Author: bsipocz

astroquery/ipac/irsa/core.py

@@ -60,6 +60,7 @@ def query_tap(self, query, *, maxrec=None):
         log.debug(f'TAP query: {query}')
         return self.tap.search(query, language='ADQL', maxrec=maxrec)
 
+    @deprecated_renamed_argument(("cache", "verbose"), (None, None), since="0.4.7")
     def query_region(self, coordinates=None, *, catalog=None, spatial='Cone',
                      radius=10 * u.arcsec, width=None, polygon=None,
                      get_query_payload=False, selcols=None,
@@ -103,11 +104,6 @@ def query_region(self, coordinates=None, *, catalog=None, spatial='Cone',
             Defaults to `False`.
         selcols : str, optional
             Target column list with value separated by a comma(,)
-        verbose : bool, optional.
-            If `True` then displays warnings when the returned VOTable does not
-            conform to the standard. Defaults to `False`.
-        cache : bool, optional
-            Use local cache when set to `True`.
 
         Returns
         -------
@@ -160,18 +156,24 @@ def query_region(self, coordinates=None, *, catalog=None, spatial='Cone',
 
         return response.to_table()
 
-    def list_tap_tables(self):
-        tap_tables = Irsa.query_tap("SELECT * FROM TAP_SCHEMA.tables")
-        return tap_tables
-
-    # TODO, deprecate this legacy in favour of full TAP table Table
-    @deprecated_renamed_argument("cache", None, "0.4.7")
-    def list_catalogs(self, cache=False):
+    @deprecated_renamed_argument("cache", None, since="0.4.7")
+    def list_catalogs(self, full=False, cache=False):
         """
-        Return a dictionary of IRSA catalogs.
+        Return information of available IRSA catalogs.
+
+        Parameters
+        ----------
+        full : bool
+            If True returns the full schema VOTable. If False returns a dictionary of the table names and
+            their description.
+
         """
         tap_tables = Irsa.query_tap("SELECT * FROM TAP_SCHEMA.tables")
-        return {tap_table['table_name']: tap_table['description'] for tap_table in tap_tables}
+
+        if full:
+            return tap_tables
+        else:
+            return {tap_table['table_name']: tap_table['description'] for tap_table in tap_tables}
 
     # TODO, deprecate this as legacy
     def print_catalogs(self):

astroquery/ipac/irsa/tests/test_irsa.py

@@ -8,7 +8,7 @@
 from astroquery.ipac.irsa import Irsa
 from astroquery.exceptions import InvalidQueryError
 
-OBJ_LIST = ["m31", "00h42m44.330s +41d16m07.50s",
+OBJ_LIST = ["00h42m44.330s +41d16m07.50s",
             SkyCoord(l=121.1743 * u.deg, b=-21.5733 * u.deg, frame="galactic")]
 
 
@@ -62,7 +62,7 @@ def test_query_allsky():
 @pytest.mark.parametrize('spatial', ['cone', 'box', 'polygon', 'all-Sky', 'All-sky', 'invalid'])
 def test_spatial_invalid(spatial):
     with pytest.raises(ValueError):
-        Irsa.query_region("m31", catalog='invalid_spatial', spatial=spatial)
+        Irsa.query_region(OBJ_LIST[0], catalog='invalid_spatial', spatial=spatial)
 
 
 def test_no_catalog():

astroquery/ipac/irsa/tests/test_irsa_remote.py

@@ -26,7 +26,7 @@ def test_query_region_cone(self, coordinates):
         """
         Test multiple ways of specifying coordinates for a conesearch
         """
-        result = Irsa.query_region(coordinates, catalog='fp_psc', spatial='Cone', cache=False)
+        result = Irsa.query_region(coordinates, catalog='fp_psc', spatial='Cone')
         assert isinstance(result, Table)
         assert len(result) == 19
         # assert all columns are returned
@@ -51,8 +51,7 @@ def test_query_region_box(self):
     def test_query_region_polygon(self):
         polygon = [(10.1, 10.1), (10.0, 10.1), (10.0, 10.0)]
         with pytest.warns(UserWarning, match='Polygon endpoints are being interpreted'):
-            result = Irsa.query_region("m31", catalog="fp_psc", spatial="Polygon",
-                                       polygon=polygon, cache=False)
+            result = Irsa.query_region("m31", catalog="fp_psc", spatial="Polygon", polygon=polygon)
 
         assert isinstance(result, Table)
 
@@ -68,4 +67,4 @@ def test_tap(self):
                           match="Partial result set. Potential causes MAXREC, async storage space, etc."):
             result = Irsa.query_tap(query=query)
         assert len(result) == 5
-        assert result.colnames == ['ra', 'dec']
+        assert result.to_table().colnames == ['ra', 'dec']