Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8424b04
move jplspec to linelists
keflavich Nov 7, 2025
8b0a216
add changelog entry
keflavich Nov 7, 2025
137e56b
fix typo in test
keflavich Nov 5, 2025
67acdbc
add generated get_molecule & associated tests
keflavich Nov 7, 2025
d46593f
Support CDMS all species option; fix format for CDMS linelist reading…
ParfenovS Apr 27, 2025
1f1c8c0
factor pseudo-common code into linelists from cdms/jplspec
keflavich Nov 7, 2025
fe162e2
ignore own deprecation warnings
keflavich Nov 7, 2025
4a235a1
add fallback by default
keflavich Nov 8, 2025
72f04a1
move the jpl fallback around
keflavich Nov 8, 2025
cd0dd1d
add new test file
keflavich Nov 8, 2025
264a908
change a test and an import
keflavich Nov 8, 2025
d1b4c95
make QN reading better, add tests
keflavich Nov 8, 2025
60da9d0
add deeper QN parsing logic
keflavich Nov 8, 2025
6065e5e
whitespace must die
keflavich Nov 8, 2025
9370e86
restore missing lookup_id table builder
keflavich Nov 8, 2025
86c9880
fix a test
keflavich Nov 8, 2025
66b8eff
yet more sophisticated parsing. methanol stymies me once again
keflavich Nov 8, 2025
0c09510
add a general test and fix the parsing to avoid truncation-driven errors
keflavich Nov 8, 2025
05ad7cc
fixed more tests
keflavich Nov 8, 2025
3e799a7
more fixes
keflavich Nov 8, 2025
aa00a66
a few more specific cases, plus one weird case
keflavich Nov 8, 2025
ffef21d
flag out a bunch of failing tests, only one of which _maybe_ should b…
keflavich Nov 9, 2025
ce02b3c
whitespace & changelogl
keflavich Nov 9, 2025
ea7cfe1
whitespace
keflavich Nov 9, 2025
031c949
add docs about failing jpl, and update docs using "--doctest-plus-gen…
keflavich Nov 9, 2025
c10a2f9
add data file to setup_package
keflavich Nov 9, 2025
0e8a6b7
fix bad changelog merge
keflavich Nov 9, 2025
330beb0
revert another bad merge
keflavich Nov 9, 2025
745282f
space
keflavich Nov 9, 2025
e4d13d9
add a test for the fallback, which forced refactoring b/c the origina…
keflavich Nov 9, 2025
7a1d670
move around the fallback machinery and give more useful user messages
keflavich Nov 9, 2025
aa23d3f
remove unnecessary parameter
keflavich Nov 9, 2025
ed1ef61
remove a redundant (and wildly incorrect) test
keflavich Nov 9, 2025
6f28988
fix more parsing
keflavich Nov 9, 2025
f8151eb
flake whitespace
keflavich Nov 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ mast

- Switch to use HTTP continuation for partial downloads. [#3448]

jplspec
^^^^^^^

- Moved to linelists/ [#3455]
- Refactored to use linelists.core [#3456]

linelists
^^^^^^^^^

- General tools for both CDMS/JPL moved to linelists.core [#3456]

Infrastructure, Utility and Other Changes and Additions
-------------------------------------------------------
Expand Down Expand Up @@ -106,6 +116,8 @@ gaia
EPOCH_SPECTRUM_XP_CROWDING, MEAN_SPECTRUM_XP, EPOCH_SPECTRUM_XP and
MEAN_SPECTRUM_XP_GRAVLENS. [#3382]

- Add more complete support for CDMS quantum number and other value parsing. [#3302]

heasarc
^^^^^^^

Expand Down
46 changes: 23 additions & 23 deletions astroquery/jplspec/__init__.py
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
"""
JPL Spectral Catalog
--------------------
JPL Spectral Catalog (Deprecated Location)
------------------------------------------

.. deprecated:: 0.4.8
The `astroquery.jplspec` module has been moved to `astroquery.linelists.jplspec`.
Please update your imports to use `from astroquery.linelists.jplspec import JPLSpec` instead.
This backward compatibility layer will be removed in a future version.

:author: Giannina Guzman ([email protected])
:author: Miguel de Val-Borro ([email protected])

"""
from astropy import config as _config
This module provides backward compatibility for the old import location.
The JPLSpec module has been reorganized under the linelists subpackage.

For new code, please use::

class Conf(_config.ConfigNamespace):
"""
Configuration parameters for `astroquery.jplspec`.
"""
server = _config.ConfigItem(
'https://spec.jpl.nasa.gov/cgi-bin/catform',
'JPL Spectral Catalog URL.')

timeout = _config.ConfigItem(
60,
'Time limit for connecting to JPL server.')
from astroquery.linelists.jplspec import JPLSpec

"""
import warnings

conf = Conf()
# Issue deprecation warning
warnings.warn(
"Importing from 'astroquery.jplspec' is deprecated. "
"Please use 'from astroquery.linelists.jplspec import JPLSpec' instead. "
"The old import path will be removed in a future version.",
DeprecationWarning,
stacklevel=2
)

from .core import JPLSpec, JPLSpecClass
# Import from the new location
from ..linelists.jplspec import JPLSpec, JPLSpecClass, Conf, conf

__all__ = ['JPLSpec', 'JPLSpecClass',
'Conf', 'conf',
]
__all__ = ['JPLSpec', 'JPLSpecClass', 'Conf', 'conf']
41 changes: 0 additions & 41 deletions astroquery/jplspec/tests/test_jplspec_remote.py

This file was deleted.

11 changes: 11 additions & 0 deletions astroquery/linelists/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
"""
Linelists module
----------------
This module contains sub-modules for various molecular and atomic line list databases,
as well as common utilities for parsing catalog files.
"""

from .core import LineListClass, parse_letternumber

__all__ = ['LineListClass', 'parse_letternumber']
Loading
Loading