Merge pull request #3406 from tsdower/3404-MAST-registry-links

Author: bsipocz

astroquery/vo_conesearch/validator/__init__.py

@@ -14,7 +14,7 @@ class Conf(_config.ConfigNamespace):
     """
     # http://www.ivoa.net/documents/RegTAP/20171206/WD-RegTAP-1.1-20171206.pdf
     conesearch_master_list = _config.ConfigItem(
-        'https://vao.stsci.edu/regtap/tapservice.aspx/sync?lang=adql&'
+        'https://mast.stsci.edu/vo-tap/api/v0.1/registry/sync?lang=ADQL&'
         'query=SELECT%20*%20FROM%20rr.capability%20'
         'NATURAL%20JOIN%20rr.interface%20NATURAL%20JOIN%20rr.resource%20'
         'NATURAL%20JOIN%20rr.res_subject%20WHERE%20'

astroquery/vo_conesearch/validator/tstquery.py

@@ -26,7 +26,7 @@ def parse_cs(ivoid, *, cap_index=1):
     """Return test query pars as dict for given IVO ID and capability index."""
 
     # Production server.
-    url = ("https://vao.stsci.edu/regtap/tapservice.aspx/sync?lang=adql&"
+    url = ("https://mast.stsci.edu/vo-tap/api/v0.1/registry/sync?lang=ADQL&"
            "query=select%20detail_xpath%2Cdetail_value%20from%20"
            "rr.res_detail%20where%20"
            "ivoid%3D%27{0}%27%20and%20cap_index={1}%20and%20"

docs/vo_conesearch/client.rst

@@ -131,7 +131,7 @@ here, we silently ignore all the warnings:
 ...     registry_db = VOSDatabase.from_registry(
 ...         validator_conf.conesearch_master_list, encoding='binary',
 ...         cache=False)
-Downloading http://vao.stsci.edu/regtap/tapservice.aspx/...
+Downloading https://mast.stsci.edu/vo-tap/api/v0.1/registry/sync...
 |==========================================|  44M/ 44M (100.00%)         0s
 >>> len(registry_db)  # doctest: +REMOTE_DATA +IGNORE_OUTPUT
 21326

docs/vo_conesearch/validator.rst

@@ -169,7 +169,7 @@ we are not trying to validate the registry itself but the services it contains:
 
 >>> from astroquery.vo_conesearch.validator import validate
 >>> validate.check_conesearch_sites()
-Downloading http://vao.stsci.edu/regtap/tapservice.aspx/...
+Downloading https://mast.stsci.edu/vo-tap/api/v0.1/registry/sync...
 |==========================================|  44M/ 44M (100.00%)         0s
 INFO: Only 18/17832 site(s) are validated [...]
 # ...