propagate column change down

trivial formatting

fix my refactor; it was incorrect

oops, fix to last one (yes, this needs to be squashed; pushing fast to skip tests... and spam my inbox...)

Author: keflavich

astroquery/linelists/cdms/core.py

@@ -148,7 +148,7 @@ def query_lines_async(self, min_frequency, max_frequency, *,
                                                 'refine your search or read the Docs '
                                                 'for pointers on how to search.')
                     payload['Molecules'] = tuple(f"{val:06d} {key}"
-                                                for key, val in luts.items())[0]
+                                                 for key, val in luts.items())[0]
                 else:
                     payload['Molecules'] = molecule
 
@@ -453,19 +453,19 @@ def _parse_cat(self, response, *, verbose=False):
                   'TAG': 44,
                   'QNFMT': 52,
                   'Q1': 55,
-                  'Q2': 58,
-                  'Q3': 60,
-                  'Q4': 62,
-                  'Q5': 64,
-                  'Q6': 66,
-                  'Q7': 68,
-                  'Q8': 70,
-                  'Q9': 72,
-                  'Q10': 74,
-                  'Q11': 76,
-                  'Q12': 78,
-                  'Q13': 80,
-                  'Q14': 82,
+                  'Q2': 57,
+                  'Q3': 59,
+                  'Q4': 61,
+                  'Q5': 63,
+                  'Q6': 65,
+                  'Q7': 67,
+                  'Q8': 69,
+                  'Q9': 71,
+                  'Q10': 73,
+                  'Q11': 75,
+                  'Q12': 77,
+                  'Q13': 79,
+                  'Q14': 81,
                   }
 
         result = ascii.read(text, header_start=None, data_start=0,

astroquery/linelists/cdms/tests/test_cdms_remote.py

@@ -41,15 +41,24 @@ def test_remote_300K():
     assert tbl['MOLWT'][0] == 18
 
 
+@pytest.mark.remote_data
+def test_co_basics():
+    tbl = CDMS.get_molecule('028503')
+    assert tbl['Q1'][0] == 1
+    assert tbl['Q7'][0] == 0
+    assert tbl['Q1'][10] == 11
+    assert tbl['Q7'][10] == 10
+    assert tbl['MOLWT'][0] == 28
+
+
 @pytest.mark.remote_data
 def test_propanediol():
     tbl1 = CDMS.get_molecule('076513')
     assert 'int' in tbl1['Q2'].dtype.name
 
     tbl = CDMS.query_lines(min_frequency=100.3 * u.GHz,
                            max_frequency=100.5 * u.GHz,
-                           molecule='076513',
-    )
+                           molecule='076513')
     assert isinstance(tbl, Table)
     assert len(tbl) >= 1
     assert 'aG\'g-1,2-Propanediol' in tbl['name']
@@ -146,8 +155,8 @@ def test_remote_all_species():
                            min_strength=-5)
     assert isinstance(tbl, Table)
 
-    AlS_is_in_table = np.char.find(tbl['name'], 'AlS') != -1
-    Propanediol_is_in_table = np.char.find(tbl['name'], "aG'g-1,2-Propanediol") != -1
+    AlS_is_in_table = (tbl['name'] == 'AlS').sum() > 0
+    Propanediol_is_in_table = (tbl['name'] == "aG'g-1,2-Propanediol").sum() > 0
 
     assert AlS_is_in_table
     assert Propanediol_is_in_table
@@ -165,4 +174,4 @@ def test_regression_allcats(self, row):
         """
         tag = f"{row['tag']:06d}"
         result = CDMS.get_molecule(tag)
-        assert len(result) >= 1
+        assert len(result) >= 1