Merge pull request #3455 from keflavich/move_jplspec

Author: bsipocz

CHANGES.rst

@@ -33,6 +33,16 @@ mast
 - Expand the supported data types for filter values in ``Mast.mast_query``. Previously, users had to input
   filter values enclosed in lists, even when specifying a single value or dictionary. [#3422]
 
+jplspec
+^^^^^^^
+
+- Moved to linelists/.  astroquery.jplspec is now deprecated in favor of astroquery.linelists.jplspec [#3455]
+
+linelists.jplspec
+^^^^^^^^^^^^^^^^^
+
+- New location for jplspec.  astroquery.jplspec is now deprecated in favor of astroquery.linelists.jplspec [#3455]
+
 
 Infrastructure, Utility and Other Changes and Additions
 -------------------------------------------------------

astroquery/jplspec/__init__.py

@@ -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.12
+    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 (gguzman2@villanova.edu)
-:author: Miguel de Val-Borro (miguel.deval@gmail.com)
-
-"""
-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']

astroquery/linelists/jplspec/__init__.py

@@ -0,0 +1,28 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+JPL Spectral Catalog
+--------------------
+"""
+from astropy import config as _config
+
+
+class Conf(_config.ConfigNamespace):
+    """
+    Configuration parameters for `astroquery.linelists.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.')
+
+
+conf = Conf()
+
+from .core import JPLSpec, JPLSpecClass
+
+__all__ = ['JPLSpec', 'JPLSpecClass',
+           'Conf', 'conf',
+           ]

astroquery/jplspec/core.py renamed to astroquery/linelists/jplspec/core.py

@@ -4,11 +4,10 @@
 
 import astropy.units as u
 from astropy.io import ascii
-from ..query import BaseQuery
-from ..utils import async_to_sync
+from astroquery.query import BaseQuery
+from astroquery.utils import async_to_sync
 # import configurable items declared in __init__.py
-from . import conf
-from . import lookup_table
+from astroquery.linelists.jplspec import conf, lookup_table
 from astroquery.exceptions import EmptyResponseError, InvalidQueryError
 
 

astroquery/jplspec/data/catdir.cat renamed to astroquery/linelists/jplspec/data/catdir.cat

@@ -11,5 +11,5 @@ def get_package_data():
                   os.path.join('data', 'multi.data')]
     paths_data = [os.path.join('data', 'catdir.cat')]
 
-    return {'astroquery.jplspec.tests': paths_test,
-            'astroquery.jplspec': paths_data, }
+    return {'astroquery.linelists.jplspec.tests': paths_test,
+            'astroquery.linelists.jplspec': paths_data, }