Merge pull request #1693 from keflavich/xmm_fixes

Fix broken master: xmm relative imports

Author: bsipocz

astroquery/esa/xmm_newton/__init__.py

@@ -15,7 +15,7 @@
 
 class Conf(_config.ConfigNamespace):
     """
-    Configuration parameters for `astroquery.xmm_newton`.
+    Configuration parameters for `astroquery.esa.xmm_newton`.
     """
     DATA_ACTION = _config.ConfigItem("http://nxsa.esac.esa.int/"
                                      "nxsa-sl/servlet/data-action?",

astroquery/esa/xmm_newton/core.py

@@ -11,19 +11,11 @@
 
 
 """
-import os
 import re
-from astroquery.utils import commons
-from astropy import units
-from astropy.units import Quantity
-from astroquery.utils.tap.core import TapPlus
-from astroquery.utils.tap.model import modelutils
-from astroquery.query import BaseQuery
-from astropy.table import Table
-from requests.exceptions import HTTPError
+from ...utils.tap.core import TapPlus
+from ...query import BaseQuery
 import shutil
 
-
 from . import conf
 from astropy import log
 

astroquery/esa/xmm_newton/tests/dummy_handler.py

@@ -9,9 +9,6 @@
 Created on 4 Sept. 2019
 """
 
-import os
-from astroquery.utils.tap.model import modelutils, taptable
-from requests.models import Response
 
 __all__ = ['DummyHandler']
 

astroquery/esa/xmm_newton/tests/dummy_tap_handler.py

@@ -10,8 +10,8 @@
 Created on 4 Sept. 2019
 """
 
-from astroquery.utils.tap.model.taptable import TapTableMeta
-from astroquery.utils.tap.model.job import Job
+from ....utils.tap.model.taptable import TapTableMeta
+from ....utils.tap.model.job import Job
 
 
 class DummyXMMNewtonTapHandler(object):

astroquery/esa/xmm_newton/tests/setup_package.py

@@ -23,4 +23,4 @@ def get_package_data():
              ]  # etc, add other extensions
     # you can also enlist files individually by names
     # finally construct and return a dict for the sub module
-    return {'astroquery.xmm_newton.tests': paths}
+    return {'astroquery.esa.xmm_newton.tests': paths}

astroquery/esa/xmm_newton/tests/test_xmm_newton.py

@@ -12,8 +12,8 @@
 
 import pytest
 
-from astroquery.xmm_newton.core import XMMNewtonClass
-from astroquery.xmm_newton.tests.dummy_tap_handler import DummyXMMNewtonTapHandler
+from ..core import XMMNewtonClass
+from ..tests.dummy_tap_handler import DummyXMMNewtonTapHandler
 
 
 class TestXMMNewton():

docs/xmm_newton/xmm_newton.rst renamed to docs/esa/xmm_newton.rst

@@ -1,10 +1,10 @@
 .. doctest-skip-all
 
-.. _astroquery.xmm_newton:
+.. _astroquery.esa.xmm_newton:
 
-************************************
-xmm_newton (`astroquery.xmm_newton`)
-************************************
+****************************************
+xmm_newton (`astroquery.esa.xmm_newton`)
+****************************************
 
 
 The X-ray Multi-Mirror Mission, XMM-Newton, is an ESA X-ray observatory launched on 10 December 1999. 
@@ -25,10 +25,10 @@ Examples
 
 .. code-block:: python
 
-  >>> from astroquery.xmm_newton import XMMNewton
+  >>> from astroquery.esa.xmm_newton import XMMNewton
   >>>
   >>> XMMNewton.download_data('0505720401',level="PPS",extension="PDF",instname="M1",filename="result0505720401.tar")
-  INFO: File result0505720401.tar downloaded to current directory [astroquery.xmm_newton.core]
+  INFO: File result0505720401.tar downloaded to current directory [astroquery.esa.xmm_newton.core]
 
 This will download all PPS files for the observation '0505720401' and instrument MOS1, with 'PDF' extension and 
 it will store them in a tar called 'result0505720401.tar'. The parameters available are detailed in the API.       
@@ -42,10 +42,10 @@ For more details of the parameters check the section 3.4 at:
 
 .. code-block:: python
 
-  >>> from astroquery.xmm_newton import XMMNewton
+  >>> from astroquery.esa.xmm_newton import XMMNewton
   >>>
   >>> XMMNewton.get_postcard('0505720401')
-  INFO: File P0505720401EPX000OIMAGE8000.PNG downloaded to current directory [astroquery.xmm_newton.core]
+  INFO: File P0505720401EPX000OIMAGE8000.PNG downloaded to current directory [astroquery.esa.xmm_newton.core]
   'P0505720401EPX000OIMAGE8000.PNG'
 
 This will download the EPIC postcard for the observation '0505720401' and it will stored in a PNG called
@@ -60,7 +60,7 @@ Query Language (ADQL).
 
 .. code-block:: python
 
-  >>> from astroquery.xmm_newton import XMMNewton
+  >>> from astroquery.esa.xmm_newton import XMMNewton
   >>>
   >>> result = XMMNewton.query_xsa_tap("select top 10 * from v_public_observations", output_format='csv', output_file='results10.csv')
   >>> print(result)
@@ -86,7 +86,7 @@ stored in the file 'results10.csv'. The result of this query can be printed by d
 
 .. code-block:: python
 
-  >>> from astroquery.xmm_newton import XMMNewton
+  >>> from astroquery.esa.xmm_newton import XMMNewton
   >>>
   >>> XMMNewton.get_tables(True)
   INFO: Retrieving tables... [astroquery.utils.tap.core]
@@ -108,7 +108,7 @@ This will show the available tables in XSA TAP service in the XMM-Newton Science
 
 .. code-block:: python
 
-  >>> from astroquery.xmm_newton import XMMNewton
+  >>> from astroquery.esa.xmm_newton import XMMNewton
   >>>
   >>> XMMNewton.get_columns('public.v_all_observations')
   INFO: Retrieving tables... [astroquery.utils.tap.core]
@@ -125,5 +125,5 @@ This will show the column details of the table 'v_all_observations' in XSA TAP s
 Reference/API
 =============
 
-.. automodapi:: astroquery.xmm_newton
-    :no-inheritance-diagram:
+.. automodapi:: astroquery.esa.xmm_newton
+    :no-inheritance-diagram:

docs/index.rst

@@ -195,7 +195,7 @@ The following modules have been completed using a common API:
   vsa/vsa.rst
   xmatch/xmatch.rst
   dace/dace.rst
-  xmm_newton/xmm_newton.rst
+  esa/xmm_newton.rst
 
 
 These others are functional, but do not follow a common & consistent API:
@@ -290,7 +290,7 @@ generally return a table listing the available data first.
   ukidss/ukidss.rst
   vsa/vsa.rst
   skyview/skyview.rst
-  xmm_newton/xmm_newton.rst
+  esa/xmm_newton.rst
 
 Simulations
 -----------