remove "top20" keyword argument as it is no longer used or supported

Author: keflavich

astroquery/splatalogue/core.py

@@ -45,9 +45,7 @@ class SplatalogueClass(BaseQuery):
     versions = ('v1.0', 'v2.0', 'v3.0', 'vall')
     # global constant, not user-configurable
     ALL_LINE_LISTS = ('LovasNIST', 'SLAIM', 'JPL', 'CDMS', 'ToyaMA', 'OSU',
-                      'Recombination', 'RFI')
-    TOP20_LIST = ('comet', 'planet', 'top20', 'ism_hotcore', 'ism_darkcloud',
-                  'ism_diffusecloud')
+                      'TopModel', 'Recombination', 'RFI')
 
     def __init__(self, **kwargs):
         """
@@ -154,7 +152,7 @@ def _default_kwargs(self):
         return json.loads(self._parse_kwargs(**kwargs)['body'])
 
     def _parse_kwargs(self, *, min_frequency=None, max_frequency=None,
-                      top20=None, chemical_name=None,
+                      chemical_name=None,
                       chem_re_flags=0, energy_min=None, energy_max=None,
                       energy_type=None, intensity_lower_limit=None,
                       intensity_type=None, transition=None, version=None,
@@ -181,10 +179,6 @@ def _parse_kwargs(self, *, min_frequency=None, max_frequency=None,
             Minimum frequency (or any spectral() equivalent)
         max_frequency : `astropy.units`
             Maximum frequency (or any spectral() equivalent)
-        top20: str
-            One of ``'comet'``, ``'planet'``, ``'top20'``, ``'ism_hotcore'``,
-            ``'ism_darkcloud'``, ``'ism_diffusecloud'``.
-            Overrides chemical_name
         chemical_name : str
             Name of the chemical to search for. Treated as a regular
             expression.  An empty set ('', (), [], {}) will match *any*

astroquery/splatalogue/tests/test_splatalogue.py

@@ -75,41 +75,6 @@ def test_linelist_type():
                                  "names.  See Splatalogue.ALL_LINE_LISTS")
 
 
-def test_top20_crashorno():
-    splatalogue.core.Splatalogue.query_lines_async(min_frequency=114 * u.GHz,
-                                                   max_frequency=116 * u.GHz,
-                                                   top20='top20',
-                                                   get_query_payload=True)
-    with pytest.raises(ValueError) as exc:
-        splatalogue.core.Splatalogue.query_lines_async(
-            min_frequency=114 * u.GHz, max_frequency=116 * u.GHz,
-            top20='invalid', get_query_payload=True)
-    assert exc.value.args[0] == "Top20 is not one of the allowed values"
-
-
-def test_band_crashorno():
-    splatalogue.core.Splatalogue.query_lines_async(band='alma3',
-                                                   get_query_payload=True)
-    with pytest.raises(ValueError) as exc:
-        splatalogue.core.Splatalogue.query_lines_async(band='invalid',
-                                                       get_query_payload=True)
-    assert exc.value.args[0] == "Invalid frequency band."
-
-
-# Upstream changed: there is no distinction between versions for this molecule
-# # regression test : version selection should work
-# # Unfortunately, it looks like version1 = version2 on the web page now, so this
-# # may no longer be a valid test
-# @pytest.mark.remote_data
-# def test_version_selection():
-#     results = splatalogue.Splatalogue.query_lines(
-# 			    min_frequency= 703*u.GHz,
-# 			    max_frequency=706*u.GHz,
-# 			    chemical_name='Acetaldehyde',
-# 			    version='v1.0'
-# 			    )
-#     assert len(results)==1
-
 def test_exclude(patch_post):
     # regression test for issue 616
     payload = splatalogue.Splatalogue.query_lines_async(min_frequency=114 * u.GHz,