changed class name from MissionsMast to MastMissions

Author: syed-gilani

astroquery/mast/__init__.py

@@ -33,13 +33,13 @@ class Conf(_config.ConfigNamespace):
 from .cutouts import TesscutClass, Tesscut, ZcutClass, Zcut
 from .observations import Observations, ObservationsClass, MastClass, Mast
 from .collections import Catalogs, CatalogsClass
-from .missions import MissionsMast, MissionsMastClass
+from .missions import MastMissions, MastMissionsClass
 from .core import MastQueryWithLogin
 from . import utils
 
 __all__ = ['Observations', 'ObservationsClass',
            'Catalogs', 'CatalogsClass',
-           'MissionsMast', 'MissionsMastClass',
+           'MastMissions', 'MastMissionsClass',
            'Mast', 'MastClass',
            'Tesscut', 'TesscutClass',
            'Zcut', 'ZcutClass',

astroquery/mast/missions.py

@@ -16,13 +16,13 @@
 from astroquery.mast import utils
 from astroquery.mast.core import MastQueryWithLogin
 
-__all__ = ['MissionsMastClass', 'MissionsMast']
+__all__ = ['MastMissionsClass', 'MastMissions']
 
 
 @async_to_sync
-class MissionsMastClass(MastQueryWithLogin):
+class MastMissionsClass(MastQueryWithLogin):
     """
-    MissionsMast search class.
+    MastMissions search class.
 
     Class that allows direct programatic access to the MAST search API for a given mission.
     """
@@ -184,4 +184,4 @@ def query_object_async(self, objectname, radius=3*u.arcmin, **kwargs):
         return self.query_region_async(coordinates, radius, **kwargs)
 
 
-MissionsMast = MissionsMastClass()
+MastMissions = MastMissionsClass()

astroquery/mast/tests/test_mast.py

@@ -180,22 +180,22 @@ def zcut_download_mockreturn(url, file_path):
 
 
 def test_missions_query_region_async(patch_post):
-    responses = mast.MissionsMast.query_region_async(regionCoords, radius=0.002, sci_pi_last_name='GORDON')
+    responses = mast.MastMissions.query_region_async(regionCoords, radius=0.002, sci_pi_last_name='GORDON')
     assert isinstance(responses, MockResponse)
 
 
 def test_missions_query_object_async(patch_post):
-    responses = mast.MissionsMast.query_object_async("M101", radius="0.002 deg")
+    responses = mast.MastMissions.query_object_async("M101", radius="0.002 deg")
     assert isinstance(responses, MockResponse)
 
 
 def test_missions_query_object(patch_post):
-    result = mast.MissionsMast.query_object("M101", radius=".002 deg")
+    result = mast.MastMissions.query_object("M101", radius=".002 deg")
     assert isinstance(result, Table)
 
 
 def test_missions_query_region(patch_post):
-    result = mast.MissionsMast.query_region(regionCoords, radius=0.002 * u.deg)
+    result = mast.MastMissions.query_region(regionCoords, radius=0.002 * u.deg)
     assert isinstance(result, Table)
 
 
@@ -211,7 +211,7 @@ def test_missions_query_criteria_async(patch_post):
     start_time = {'sci_start_time': ""}
     obs_type = {'sci_obs_type': 'all'}
     aec = {'sci_aec': 'S'}
-    responses = mast.MissionsMast.query_criteria_async(coordinates=regionCoords,
+    responses = mast.MastMissions.query_criteria_async(coordinates=regionCoords,
                                                        radius=3,
                                                        conditions=[pep_id,
                                                                    obs_type,

docs/mast/mast.rst

@@ -196,15 +196,15 @@ the current Mission Search interface.
 Currenlty, the API only includes the search functionality. The functionality to
 download data products associated with search results is not currently supported. 
 
-An object of MissionsMast class is instantiated with a default mission of 'hst' and 
+An object of MastMissions class is instantiated with a default mission of 'hst' and 
 default service set to 'search'. set_service() and set_mission() can be used to change
 the service and mission to other values but right now, API only supports search service
 and 'hst' mission.
 
 .. code-block:: python
 
-                >>> from astroquery.mast.missions import MissionsMast
-                >>> missions = MissionsMast()
+                >>> from astroquery.mast.missions import MastMissions
+                >>> missions = MastMissions()
                 >>> missions.mission
                 'hst'
                 >>> missions.service
@@ -222,9 +222,9 @@ for a non cone search, select_cols would always include search_key and sci_data_
 
 .. code-block:: python
 
-                >>> from astroquery.mast.missions import MissionsMast
+                >>> from astroquery.mast.missions import MastMissions
                 >>> from astropy.coordinates import SkyCoord
-                >>> missions = MissionsMast()
+                >>> missions = MastMissions()
                 >>> regionCoords = SkyCoord(210.80227, 54.34895, unit=('deg', 'deg'))
                 >>> results = missions.query_region(regionCoords, 3, sci_pep_id=12556, select_cols=["sci_stop_time", "sci_targname", "sci_start_time", "sci_status"], sort_by=['sci_targname'])
                 >>> results[:5]
@@ -244,9 +244,9 @@ of returned records. the default values for offset and limit is 0 and 5000 respe
 
 .. code-block:: python
 
-                >>> from astroquery.mast.missions import MissionsMast
+                >>> from astroquery.mast.missions import MastMissions
                 >>> from astropy.coordinates import SkyCoord
-                >>> missions = MissionsMast()
+                >>> missions = MastMissions()
                 >>> results = missions.query_criteria(sci_start_time=">=2021-01-01 00:00:00", select_cols=["sci_stop_time", "sci_targname", "sci_start_time", "sci_status", "sci_pep_id"], sort_by=['sci_pep_id'], limit=1000, offset=1000)
                 >>> len(results)
                 >>> 1000