Merge pull request #2658 from bsipocz/alma_siav2_renames

MAINT: use the updated class and variable names for SIA v2

Author: bsipocz

astroquery/alma/core.py

@@ -19,7 +19,13 @@
 from astropy.utils.console import ProgressBar
 from astropy import units as u
 from astropy.time import Time
-from pyvo.dal.sia2 import SIA_PARAMETERS_DESC
+
+try:
+    from pyvo.dal.sia2 import SIA2_PARAMETERS_DESC, SIA2Service
+except ImportError:
+    # Can be removed once min version of pyvo is 1.5
+    from pyvo.dal.sia2 import SIA_PARAMETERS_DESC as SIA2_PARAMETERS_DESC
+    from pyvo.dal.sia2 import SIAService as SIA2Service
 
 from ..exceptions import LoginError
 from ..utils import commons
@@ -243,7 +249,7 @@ def datalink_url(self):
     @property
     def sia(self):
         if not self._sia:
-            self._sia = pyvo.dal.sia2.SIAService(baseurl=self.sia_url)
+            self._sia = SIA2Service(baseurl=self.sia_url)
         return self._sia
 
     @property
@@ -434,7 +440,7 @@ def query_sia(self, *, pos=None, band=None, time=None, pol=None,
 
         Returns
         -------
-        Results in `pyvo.dal.SIAResults` format.
+        Results in ``pyvo.dal.sia2.SIA2Results`` format.
         result.table in Astropy table format
         """
         return self.sia.search(
@@ -458,11 +464,11 @@ def query_sia(self, *, pos=None, band=None, time=None, pol=None,
             maxrec=maxrec,
             **kwargs)
 
-    # SIA_PARAMETERS_DESC contains links that Sphinx can't resolve.
+    # SIA2_PARAMETERS_DESC contains links that Sphinx can't resolve.
     for var in ('POLARIZATION_STATES', 'CALIBRATION_LEVELS'):
-        SIA_PARAMETERS_DESC = SIA_PARAMETERS_DESC.replace(f'`pyvo.dam.obscore.{var}`',
-                                                          f'pyvo.dam.obscore.{var}')
-    query_sia.__doc__ = query_sia.__doc__.replace('_SIA2_PARAMETERS', SIA_PARAMETERS_DESC)
+        SIA2_PARAMETERS_DESC = SIA2_PARAMETERS_DESC.replace(f'`pyvo.dam.obscore.{var}`',
+                                                            f'pyvo.dam.obscore.{var}')
+    query_sia.__doc__ = query_sia.__doc__.replace('_SIA2_PARAMETERS', SIA2_PARAMETERS_DESC)
 
     def query_tap(self, query, maxrec=None):
         """
@@ -498,11 +504,11 @@ def help_tap(self):
 
     # update method pydocs
     query_region_async.__doc__ = query_region_async.__doc__.replace(
-        '_SIA2_PARAMETERS', pyvo.dal.sia2.SIA_PARAMETERS_DESC)
+        '_SIA2_PARAMETERS', SIA2_PARAMETERS_DESC)
     query_object_async.__doc__ = query_object_async.__doc__.replace(
-        '_SIA2_PARAMETERS', pyvo.dal.sia2.SIA_PARAMETERS_DESC)
+        '_SIA2_PARAMETERS', SIA2_PARAMETERS_DESC)
     query_async.__doc__ = query_async.__doc__.replace(
-        '_SIA2_PARAMETERS', pyvo.dal.sia2.SIA_PARAMETERS_DESC)
+        '_SIA2_PARAMETERS', SIA2_PARAMETERS_DESC)
 
     def _get_dataarchive_url(self):
         """