Merge pull request #2067 from IPAC-SW/nasa_exoplanet_archive_2

Updates to nasa_exoplanet_archive module to make it compatible with Archive 2.0

Author: bsipocz

CHANGES.rst

@@ -28,9 +28,16 @@ heasarc
 ^^^^^^^
 
 - Added posibility to query limited time range. [#1988]
-- Add alternative instance of HEASARC Server, maintained by 
+- Add alternative instance of HEASARC Server, maintained by
   INTEGRAL Science Data Center. [#1988]
 
+nasa_exoplanet_archive
+^^^^^^^^^^^^^^^^^^^^^^
+
+- Making module compatible with the NASA Exoplanet Archive 2.0 using TAP.
+  release. Support for querying old tables (exoplanets, compositepars, and
+  exomultpars) has been dropped. [#2067]
+
 
 Service fixes and enhancements
 ------------------------------

astroquery/nasa_exoplanet_archive/__init__.py

@@ -15,9 +15,12 @@ class Conf(_config.ConfigNamespace):
     Configuration parameters for `astroquery.nasa_exoplanet_archive`.
     """
 
-    url = _config.ConfigItem(
+    url_api = _config.ConfigItem(
         "https://exoplanetarchive.ipac.caltech.edu/cgi-bin/nstedAPI/nph-nstedAPI",
         "URL for the NASA Exoplanet Archive API")
+    url_tap = _config.ConfigItem(
+        "https://exoplanetarchive.ipac.caltech.edu/TAP/",
+        "URL for the NASA Exoplanet Archive TAP")
     timeout = _config.ConfigItem(
         600, "Time limit for requests from the NASA Exoplanet Archive servers")
     cache = _config.ConfigItem(False, "Should the requests be cached?")

astroquery/nasa_exoplanet_archive/core.py

@@ -1,3 +1,9 @@
-ERROR<br>
-Error Type: exoLookup call failure<br>
-Message:    String not coordinate or object name in Exoplanet Archive, CDS, or NED
+aliasdis
+HD 209458 b
+2MASS J22031077+1853036 b
+BD+18 4917 b
+HIP 108859 b
+SAO 107623 b
+TYC 1688-01821-1 b
+V0376 Peg b
+WISE J220310.79+185303.3 b

astroquery/nasa_exoplanet_archive/tests/data/aliastable_expect_2.txt

@@ -1,9 +1,9 @@
 aliasdis
-HD 209458 b
-2MASS J22031077+1853036 b
-BD+18 4917 b
-HIP 108859 b
-SAO 107623 b
-TYC 1688-01821-1 b
-V0376 Peg b
-WISE J220310.79+185303.3 b
+HD 209458
+2MASS J22031077+1853036
+BD+18 4917
+HIP 108859
+SAO 107623
+TYC 1688-01821-1
+V0376 Peg
+WISE J220310.79+185303.3

astroquery/nasa_exoplanet_archive/tests/data/aliastable_expect_3.txt

@@ -1,9 +1,15 @@
 aliasdis
-HD 209458
-2MASS J22031077+1853036
-BD+18 4917
-HIP 108859
-SAO 107623
-TYC 1688-01821-1
-V0376 Peg
-WISE J220310.79+185303.3
+HD 136352
+2MASS J15214824-4819032
+CD-47 9919
+CPD-47 7075
+GJ 582
+HIP 75181
+HR 5699
+IRAS 15183-4808
+LHS 395
+SAO 225697
+TIC 136916387
+TOI-2011
+TYC 8298-01229-1
+nu 2 Lup

astroquery/nasa_exoplanet_archive/tests/data/aliastable_expect_4.txt

@@ -1,13 +1,12 @@
 aliasdis
-HD 136352
-2MASS J15214824-4819032
-CD-47 9919
-CPD-47 7075
-GJ 582
-HIP 75181
-HR 5699
-IRAS 15183-4808
-LHS 395
-SAO 225697
-TYC 8298-01229-1
-nu 2 Lup
+HAT-P-11 b
+2MASS J19505021+4804508 b
+BD+47 2936 b
+HIP 97657 b
+K00003.01
+KIC 10748390 b
+KOI-3 b
+KOI-3.01
+Kepler-3 b
+TYC 3561-02092-1 b
+WISE J195050.38+480453.5 b

astroquery/nasa_exoplanet_archive/tests/data/aliastable_expect_5.txt

@@ -1,9 +1,3 @@
-aliasdis
-HAT-P-7
-2MASS J19285935+4758102
-BD+47 2846
-KIC 10666592
-KOI-2
-Kepler-2
-TYC 3547-01402-1
-WISE J192859.33+475810.3
+ERROR<br>
+Error Type: exoLookup call failure<br>
+Message:    Object not found by Exoplanet Archive, SIMBAD, or NED.