Merge pull request #2597 from esdc-esac-esa-int/ESA_eHST-tap_https_url

eHST queries and data using TAP and minor fixes in ESA modules

Author: bsipocz

CHANGES.rst

@@ -16,6 +16,12 @@ hsa
 
 - New module to access ESA Herschel mission. [#2122]
 
+esa.hubble
+^^^^^^^^^^
+
+- Update to TAP url to query data and download files, aligned with the new eHST Science Archive. [#2567][#2597]
+- Status and maintenance messages from eHST TAP when the module is instantiated. get_status_messages method to retrieve them. [#2597]
+- Optional parameters in all methods are kwargs keyword only. [#2597]
 
 Service fixes and enhancements
 ------------------------------
@@ -31,9 +37,8 @@ esa.hubble
 
 - Refactored query_criteria to use ehst.archive table therefore making the query
   a lot faster. [#2524]
-
-- Update TAP url to avoid 301 HTTPError. [#2567]
-
+- Method query_hst_tap has been deprecated and is replaced with query_tap, with the same arguments. [#2597]
+- Product types in download_product method have been modified to: PRODUCT, SCIENCE_PRODUCT or POSTCARD. [#2597]
 
 alma
 ^^^^

astroquery/esa/hubble/__init__.py

@@ -1,35 +1,30 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
 """
-
-@author: Javier Duran
-@contact: [email protected]
+==========
+eHST Init
+==========
 
 European Space Astronomy Centre (ESAC)
 European Space Agency (ESA)
 
-Created on 13 Aug. 2018
-
 """
 
 from astropy import config as _config
+from astropy.config import paths
+import os
 
 
 class Conf(_config.ConfigNamespace):
     """
     Configuration parameters for `astroquery.esa.hubble`.
     """
-    DATA_ACTION = _config.ConfigItem("http://archives.esac.esa.int/"
-                                     "ehst-sl-server/servlet/data-action",
-                                     "Main url for retriving hst files")
-    METADATA_ACTION = _config.ConfigItem("http://archives.esac.esa.int/"
-                                         "ehst-sl-server/servlet/"
-                                         "metadata-action",
-                                         "Main url for retriving hst metadata")
-    TARGET_ACTION = _config.ConfigItem("http://archives.esac.esa.int/"
-                                       "ehst-sl-server/servlet/"
-                                       "targetresolver-action",
-                                       "Main url for solving targets")
+    EHST_TAP_SERVER = _config.ConfigItem("https://hst.esac.esa.int/tap-server/tap", "eHST TAP Server")
+    EHST_TARGET_ACTION = _config.ConfigItem("servlet/target-resolver?", "eHST Target Resolver")
+    EHST_MESSAGES = _config.ConfigItem("notification?action=GetNotifications", "eHST Messages")
     TIMEOUT = 60
 
+    cache_location = os.path.join(paths.get_cache_dir(), 'astroquery/ehst', )
+
 
 conf = Conf()