Skip to content

Commit

Permalink
Merge pull request astropy#3202 from keflavich/issue3007
Browse files Browse the repository at this point in the history 
Fix issue 3007: offline tests should be valid
  • Loading branch information
@bsipocz
bsipocz authored Feb 12, 2025
2 parents 0c90d6e + 250cd59 commit d619223
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 8 deletions.
5 changes: 5 additions & 0 deletions astroquery/linelists/cdms/core.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,11 @@ def query_lines_async(self, min_frequency, max_frequency, *,
timeout=self.TIMEOUT, cache=cache)
response.raise_for_status()

if 'Ups! Code: 011' in response.text:
raise InvalidQueryError("Specified query was invalid. Check that"
" a valid molecule name was specified. "
f"Payload was {payload}.")

soup = BeautifulSoup(response.text, 'html.parser')

ok = False
Expand Down
9 changes: 8 additions & 1 deletion astroquery/linelists/cdms/data/catdir.cat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
| 37502 | 36ArH+ | 27 | 1* | e037502.cat | Sep. 2007 | w037502.cat |
| 37503 | HD34S | 1754 | 1* | e037503.cat | Nov. 2008 | w037503.cat |
| 37504 | H2Cl+ | 600 | 1* | e037504.cat | Mar. 2015 | |
| 37505 | C3H+ | 59 | 3* | e037505.cat | Mar. 2015 | |
| 37505 | C3H+ | 59 | 4* | e037505.cat | Jan. 2025 | |
| 38501 | l-C3H2 | 981 | 2 | e038501.cat | June 2002 | |
| 38502 | C2N | 574 | 2* | e038502.cat | Nov. 2014 | |
| 38503 | C3D, v = 0, v4 = 1, 2Σμ | 1770 | 2* | e038503.cat | Mar. 2009 | |
Expand Down Expand Up @@ -515,6 +515,8 @@
| 49520 | MgC13C | 12 | 1* | e049520.cat | Jan. 2023 | |
| 49521 | C37Cl+, v = 0 | 93 | 1* | e049521.cat | Jun. 2023 | |
| 49522 | 30SiF+, v = 0 | 32 | 1* | e049522.cat | Aug. 2023 | |
| 49523 | a-NH2SH | 58 | 1* | e049523.cat | Jan. 2025 | |
| 49524 | s-NH2SH | 128 | 1* | e049524.cat | Jan. 2025 | |
| 50501 | 34SO | 397 | 1 | e050501.cat | Aug. 1998 | |
| 50502 | S18O | 359 | 1 | e050502.cat | Aug. 1998 | |
| 50503 | l-C4H2 | 581 | 2 | e050503.cat | May 2002 | |
Expand Down Expand Up @@ -753,6 +755,7 @@
| 58520 | HCCSH | 1040 | 1* | e058520.cat | May 2019 | |
| 58521 | 26MgS, v = 0 | 47 | 1* | e058521.cat | Feb. 2022 | |
| 58522 | Mg34S, v = 0 | 46 | 1* | e058522.cat | Feb. 2022 | |
| 58523 | DCCS | 262 | 1* | e058523.cat | Jan. 2025 | |
| 59501 | MgCl | 624 | 1 | e059501.cat | June 2000 | |
| 59502 | CaF | 234 | 1 | e059502.cat | Sep. 2001 | |
| 59503 | HNCS, a-type | 489 | 1* | e059503.cat | Feb. 2005 | |
Expand Down Expand Up @@ -1018,6 +1021,7 @@
| 70513 | NH2CH2CH2CN, conf. I | 42874 | 1* | e070513.cat | Apr. 2020 | |
| 70514 | NH2CH2CH2CN, conf. II | 43558 | 1* | e070514.cat | Apr. 2020 | |
| 70515 | NCCS | 260 | 1* | e070515.cat | Oct. 2024 | |
| 70516 | c-H2C3S | 474 | 1* | e070516.cat | Jan. 2025 | |
| 70601 | 54FeO Ω = 4 | 56 | 1* | e070601.cat | Feb. 2019 | |
| 70602 | 54FeO Ω = 3 | 58 | 1* | e070602.cat | Feb. 2019 | |
| 70603 | 54FeO Ω = 2 | 60 | 1* | e070603.cat | Feb. 2019 | |
Expand Down Expand Up @@ -1045,6 +1049,7 @@
| 72507 | H2C334S | 321 | 1* | e072507.cat | June 2022 | |
| 72508 | H2C=C(OH)CHO | 25075 | 1* | e072508.cat | Oct. 2022 | |
| 72509 | C2H5CP, v = 0 | 27840 | 1* | e072509.cat | Jun. 2024 | |
| 72510 | c-H2C334S | 208 | 1* | e072510.cat | Jan. 2025 | |
| 72601 | FeO Ω = 4 | 56 | 1* | e072601.cat | Feb. 2019 | |
| 72602 | FeO Ω = 3 | 58 | 1* | e072602.cat | Feb. 2019 | |
| 72603 | FeO Ω = 2 | 60 | 1* | e072603.cat | Feb. 2019 | |
Expand Down Expand Up @@ -1083,6 +1088,7 @@
| 74520 | H2NCH2C(O)NH2 | 60120 | 1* | e074520.cat | Jan. 2022 | |
| 74521 | HC2HC4 | 801 | 1* | e074521.cat | Dec. 2022 | |
| 74522 | MgC3N+ | 41 | 1* | e074522.cat | Apr. 2023 | |
| 74523 | CHSCHO | 409 | 1* | e074523.cat | Feb. 2025 | |
| 75501 | HC4NC | 71 | 3* | e075501.cat | Dec. 2024 | |
| 75502 | CaCl | 1131 | 1 | e075502.cat | Sep. 2001 | |
| 75503 | HC5N, v = 0 | 199 | 2* | e075503.cat | Aug. 2020 | |
Expand Down Expand Up @@ -1185,6 +1191,7 @@
| 83506 | a-(CH3)2CHCH2CN | 48126 | 1* | e083506.cat | Aug. 2018 | |
| 83507 | g-(CH3)2CHCH2CN | 36915 | 1* | e083507.cat | Aug. 2018 | |
| 83508 | NCHCCS | 691 | 1* | e083508.cat | May 2024 | |
| 83509 | HCCSCN | 6168 | 1* | e083509.cat | Jan. 2025 | |
| 84501 | FeCO | 313 | 1 | e084501.cat | Mar. 2004 | |
| 84502 | OC3S | 175 | 1* | e084502.cat | Oct. 2013 | |
| 84503 | c-C4H4O2 | 46011 | 1* | e084503.cat | Oct. 2016 | |
Expand Down
7 changes: 7 additions & 0 deletions astroquery/linelists/cdms/data/partfunc.cat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,8 @@
| 49520 | MgCC-13 | 12 | nan | nan | 4.0866 | 3.8989 | 3.6346 | 3.1831 | 2.7322 | 2.2823 | 1.8341 | 1.4307 | 1.0462 |
| 49521 | CCl-37+, v=0 | 93 | nan | nan | 3.0297 | 2.9034 | 2.7273 | 2.4272 | 2.1283 | 1.8316 | 1.5394 | 1.2818 | 1.0461 |
| 49522 | Si-30-F+, v=0 | 32 | 3.1653 | 2.7731 | 2.5309 | 2.4034 | 2.2269 | 1.9266 | 1.6272 | 1.3296 | 1.0355 | nan | nan |
| 49523 | a-NH2SH | 58 | nan | nan | 4.1867 | 3.999 | 3.7348 | 3.2836 | 2.8331 | 2.3841 | 1.9376 | 1.5379 | 1.1774 |
| 49524 | s-NH2SH | 128 | nan | nan | 4.1819 | 3.9946 | 3.7306 | 3.2796 | 2.8292 | 2.3802 | 1.9338 | 1.5342 | 1.1739 |
| 50501 | S-34-O | 397 | nan | nan | 2.938 | 2.8094 | 2.626 | 2.3039 | 1.964 | 1.5972 | 1.2081 | 0.8755 | 0.6107 |
| 50502 | SO-18 | 359 | nan | nan | 2.9627 | 2.8339 | 2.6504 | 2.328 | 1.9873 | 1.6191 | 1.2276 | 0.8923 | 0.6252 |
| 50503 | l-C4H2 | 581 | nan | nan | 4.3663 | 4.1787 | 3.9144 | 3.4628 | 3.011 | 2.5456 | 2.0229 | nan | nan |
Expand Down Expand Up @@ -753,6 +755,7 @@
| 58520 | HCCSH | 1040 | nan | nan | 3.9714 | 3.7839 | 3.5196 | 3.0681 | 2.6169 | 2.1663 | 1.718 | 1.3356 | 1.0335 |
| 58521 | Mg-26-S, v=0 | 47 | nan | nan | 2.9522 | 2.8047 | 2.6149 | 2.3108 | 2.0104 | 1.7107 | 1.4125 | nan | nan |
| 58522 | MgS-34, v=0 | 46 | nan | nan | 2.9428 | 2.7957 | 2.6063 | 2.3024 | 2.002 | 1.7024 | 1.4042 | nan | nan |
| 58523 | DCCS | 262 | nan | nan | 3.9555 | 3.7966 | 3.5801 | 3.2491 | 2.9479 | 2.6523 | 2.362 | 2.1078 | 1.8774 |
| 59501 | MgCl | 624 | nan | nan | 3.8344 | 3.7093 | 3.5331 | 3.2322 | 2.9317 | 2.632 | 2.3336 | nan | nan |
| 59502 | CaF | 234 | nan | nan | 3.3875 | 3.2625 | 3.0863 | 2.7856 | 2.4854 | 2.1862 | 1.8888 | nan | nan |
| 59503 | HNCS, a-type | 489 | nan | 3.9813 | 3.6451 | 3.4526 | 3.1805 | 2.7185 | 2.2651 | 1.8552 | 1.528 | 1.2577 | 1.001 |
Expand Down Expand Up @@ -1018,6 +1021,7 @@
| 70513 | NH2CH2CH2CN, conf. I | 42874 | nan | nan | 5.2002 | 4.9966 | 4.7028 | 4.18 | 3.6463 | 3.1472 | 2.6888 | nan | nan |
| 70514 | NH2CH2CH2CN, conf. II | 43558 | nan | nan | 5.2002 | 4.9966 | 4.7028 | 4.18 | 3.6463 | 3.1472 | 2.6888 | nan | nan |
| 70515 | NCCS | 260 | nan | nan | 5.1344 | 4.9469 | 4.6829 | 4.2317 | 3.7811 | 3.3316 | 2.8841 | 2.4841 | 2.129 |
| 70516 | Cyclopropenthione | 474 | nan | nan | 4.9062 | 4.7187 | 4.4545 | 4.003 | 3.5517 | 3.1008 | 2.6506 | 2.2433 | 1.8467 |
| 70601 | Fe-54-O, Om=4 | 56 | 4.0709 | 3.5172 | 3.1411 | 2.9463 | 2.6961 | 2.3374 | 2.0424 | 1.7768 | 1.5446 | 1.3831 | 1.2904 |
| 70602 | Fe-54-O, Om=3 | 58 | 4.0709 | 3.5172 | 3.1411 | 2.9463 | 2.6961 | 2.3374 | 2.0424 | 1.7768 | 1.5446 | 1.3831 | 1.2904 |
| 70603 | Fe-54-O, Om=2 | 60 | 4.0709 | 3.5172 | 3.1411 | 2.9463 | 2.6961 | 2.3374 | 2.0424 | 1.7768 | 1.5446 | 1.3831 | 1.2904 |
Expand Down Expand Up @@ -1045,6 +1049,7 @@
| 72507 | H2C3S-34 | 321 | nan | nan | 4.6251 | 4.4375 | 4.1732 | 3.7215 | 3.2696 | 2.8039 | 2.281 | 1.772 | 1.3854 |
| 72508 | 2-Hydroxypropenal | 25075 | nan | nan | 4.8617 | 4.6741 | 4.4099 | 3.9583 | 3.5069 | 3.0559 | 2.6055 | 2.1981 | 1.8063 |
| 72509 | C2H5CP, v=0 | 27840 | nan | nan | 4.8264 | 4.6386 | 4.374 | nan | nan | 4.493 | nan | nan | nan |
| 72510 | c-H2C3S-34 | 208 | nan | nan | 4.918 | 4.7305 | 4.4662 | 4.0147 | 3.5634 | 3.1125 | 2.6623 | 2.2549 | 1.8582 |
| 72601 | FeO, Om=4 | 56 | 4.0754 | 3.5211 | 3.1447 | 2.9498 | 2.6996 | 2.3407 | 2.0456 | 1.7798 | 1.5471 | 1.3848 | 1.2912 |
| 72602 | FeO, Om=3 | 58 | 4.0754 | 3.5211 | 3.1447 | 2.9498 | 2.6996 | 2.3407 | 2.0456 | 1.7798 | 1.5471 | 1.3848 | 1.2912 |
| 72603 | FeO, Om=2 | 60 | 4.0754 | 3.5211 | 3.1447 | 2.9498 | 2.6996 | 2.3407 | 2.0456 | 1.7798 | 1.5471 | 1.3848 | 1.2912 |
Expand Down Expand Up @@ -1083,6 +1088,7 @@
| 74520 | H2NCH2C(O)NH2 | 60120 | nan | nan | 5.2091 | 5.0183 | 4.7476 | 4.2774 | 3.7916 | 3.2822 | 2.7515 | 2.2808 | 1.8648 |
| 74521 | HC2HC4 | 801 | nan | nan | 5.0849 | 4.8946 | 4.6275 | 4.173 | 3.7202 | 3.2682 | 2.8168 | 2.4082 | 2.0145 |
| 74522 | MgC3N+ | 41 | nan | nan | 3.6357 | 3.5107 | 3.3346 | 3.0336 | 2.7327 | 2.4319 | 2.1314 | 1.8594 | 1.5974 |
| 74523 | CHSCHO | 409 | nan | nan | 4.6448 | 4.4572 | 4.1929 | 3.7412 | 3.2898 | 2.8387 | 2.3882 | 1.9804 | 1.5882 |
| 75501 | HC4NC | 71 | nan | nan | 4.1267 | 4.0017 | 3.8257 | 3.5247 | 3.2238 | 2.923 | 2.6225 | 2.3504 | 2.0884 |
| 75502 | CaCl | 1131 | nan | nan | 4.0418 | 3.9167 | 3.7404 | 3.4394 | 3.1387 | 2.8384 | 2.539 | nan | nan |
| 75503 | HC5N, v=0 | 199 | nan | 4.3708 | 4.1489 | 4.024 | 3.8479 | 3.5469 | 3.246 | 2.9452 | 2.6446 | 2.3725 | 2.1104 |
Expand Down Expand Up @@ -1185,6 +1191,7 @@
| 83506 | 3-MABN, v=0 | 48126 | nan | nan | 5.6973 | 5.5095 | 5.245 | 4.7932 | 4.3416 | 3.8903 | 3.4394 | nan | nan |
| 83507 | 3-MGBN, v=0 | 36915 | nan | nan | 5.6973 | 5.5095 | 5.245 | 4.7932 | 4.3416 | 3.8903 | 3.4394 | nan | nan |
| 83508 | NCHCCS | 691 | nan | nan | 5.5032 | 5.3139 | 5.0479 | 4.5947 | 4.1425 | 3.6909 | 3.2397 | 2.8312 | 2.4377 |
| 83509 | HCCSCN | 6168 | nan | nan | 5.5258 | 5.3377 | 5.0729 | 4.6207 | 4.169 | 3.7176 | 3.2668 | 2.8587 | 2.4658 |
| 84501 | FeCO | 313 | nan | nan | 3.5734 | 3.4294 | 3.2169 | 2.8206 | 2.3883 | 1.9858 | 1.662 | nan | nan |
| 84502 | OC3S | 175 | nan | nan | 3.6457 | 3.5207 | 3.3446 | 3.0436 | 2.7427 | 2.4419 | 2.1414 | 1.8693 | 1.6074 |
| 84503 | Diketene | 46011 | nan | nan | 4.9981 | 4.8106 | 4.5464 | 4.0949 | 3.6435 | 3.1924 | 2.7417 | 2.3337 | 1.9409 |
Expand Down
7 changes: 4 additions & 3 deletions astroquery/linelists/cdms/setup_package.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@

def get_package_data():

paths_test = [os.path.join('data', 'CO.data'),
os.path.join('data', 'HC7S.data'),
os.path.join('data', 'HC7N.data'),
paths_test = [os.path.join('data', '028503 CO, v=0.data'),
os.path.join('data', '117501 HC7S.data'),
os.path.join('data', '099501 HC7N, v=0.data'),
os.path.join('data', 'post_response.html'),
]

paths_data = [os.path.join('data', 'catdir.cat'),
os.path.join('data', 'partfunc.cat')]

Expand Down
0 astroquery/linelists/cdms/tests/data/CO.data → ...lists/cdms/tests/data/028503 CO, v=0.data
View file
File renamed without changes.
0 ...query/linelists/cdms/tests/data/HC7N.data → ...sts/cdms/tests/data/099501 HC7N, v=0.data
View file
File renamed without changes.
0 ...query/linelists/cdms/tests/data/HC7S.data → ...inelists/cdms/tests/data/117501 HC7S.data
View file
File renamed without changes.
9 changes: 5 additions & 4 deletions astroquery/linelists/cdms/tests/test_cdms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ def test_query(patch_post):
tbl = CDMS.query_lines(min_frequency=100 * u.GHz,
max_frequency=1000 * u.GHz,
min_strength=-500,
molecule="CO")
molecule='028503 CO, v=0'
)
assert isinstance(tbl, Table)
assert len(tbl) == 8
assert set(tbl.keys()) == colname_set
Expand Down Expand Up @@ -109,7 +110,7 @@ def test_hc7s(patch_post):
CDMS.query_lines_async(100*u.GHz, 100.755608*u.GHz, molecule='HC7S', parse_name_locally=True)
"""

tbl = CDMS.query_lines(100*u.GHz, 100.755608*u.GHz, molecule='HC7S',)
tbl = CDMS.query_lines(100*u.GHz, 100.755608*u.GHz, molecule='117501 HC7S',)
assert isinstance(tbl, Table)
assert len(tbl) == 5
assert set(tbl.keys()) == colname_set
Expand Down Expand Up @@ -139,7 +140,7 @@ def test_hc7n(patch_post):
CDMS.query_lines(200*u.GHz, 230.755608*u.GHz, molecule='HC7N',parse_name_locally=True)
"""

tbl = CDMS.query_lines(200*u.GHz, 230.755608*u.GHz, molecule='HC7N')
tbl = CDMS.query_lines(200*u.GHz, 230.755608*u.GHz, molecule='099501 HC7N, v=0')
assert isinstance(tbl, Table)
assert len(tbl) == 27
assert set(tbl.keys()) == colname_set
Expand All @@ -163,7 +164,7 @@ def test_hc7n(patch_post):

def test_retrieve_species_table_local():
species_table = CDMS.get_species_table(use_cached=True)
assert len(species_table) == 1293
assert len(species_table) == 1300
assert 'int' in species_table['tag'].dtype.name
assert 'int' in species_table['#lines'].dtype.name
assert 'float' in species_table['lg(Q(1000))'].dtype.name
Expand Down

0 comments on commit d619223

Please sign in to comment.