rename some things

Author: keflavich

astroquery/splatalogue/tests/test_splatalogue.py

@@ -2,6 +2,7 @@
 
 import os
 import pytest
+import json
 
 from astropy import units as u
 
@@ -117,6 +118,7 @@ def test_exclude(patch_post):
                                                         exclude=None,
                                                         get_query_payload=True)
 
+    payload = json.loads(payload['body'])
     exclusions = {'excludePotentialInterstellarSpecies': False,
                   'excludeAtmosSpecies': False,
                   'excludeProbableInterstellarSpecies': False,
@@ -131,6 +133,7 @@ def test_exclude(patch_post):
                                                         chemical_name=' CO ',
                                                         exclude='none',
                                                         get_query_payload=True)
+    payload = json.loads(payload['body'])
 
     for key in exclusions:
         assert not payload[key]

astroquery/splatalogue/tests/test_utils.py

@@ -16,15 +16,6 @@ def test_clean(patch_post):
     assert 'resolved_QNs' in c.colnames
 
 
-def test_merge(patch_post):
-    x = splatalogue.Splatalogue.query_lines(min_frequency=114 * u.GHz,
-                                            max_frequency=116 * u.GHz,
-                                            chemical_name=' CO ')
-    c = utils.merge_frequencies(x)
-    assert 'Freq' in c.colnames
-    assert np.all(c['Freq'] > 0)
-
-
 def test_minimize(patch_post):
     x = splatalogue.Splatalogue.query_lines(min_frequency=114 * u.GHz,
                                             max_frequency=116 * u.GHz,
@@ -34,7 +25,7 @@ def test_minimize(patch_post):
     assert 'Freq' in c.colnames
     assert np.all(c['Freq'] > 0)
     assert 'Resolved QNs' not in c.colnames
-    assert 'QNs' in c.colnames
+    assert 'resolved_QNs' in c.colnames
 
 
 @pytest.mark.remote_data

astroquery/splatalogue/utils.py

@@ -43,10 +43,10 @@ def clean_columns(table):
             ]
 
 
-def minimize_table(table, *, columns=['Species', 'Chemical Name',
-                                      'Resolved QNs',
+def minimize_table(table, *, columns=['name', 'chemical_name',
+                                      'resolved_QNs',
                                       'orderedfreq',
-                                      'Log<sub>10</sub> (A<sub>ij</sub>)',
+                                      'aij',
                                       'E_U (K)'],
                    merge=True,
                    clean=True):