changes requested

Author: tinuademargaret

CHANGES.rst

@@ -7,13 +7,15 @@ Service fixes and enhancements
 gemini
 ^^^^^^
 
-- Renamed and deprecated Observations and ObservationsClass in GEMINI module. [#1885]
+- Renamed and deprecated ``Observations`` and ``ObservationsClass`` to ``GeminiObservations`` 
+  and ``GeminiObservationsClass`` . [#1885]
 
 
 mast
 ^^^^
 
-- Renamed and deprecated Observations and ObservationsClass in MAST module. [#1885]
+- Renamed and deprecated ``Observations`` and ``ObservationsClass`` to ``MastObservations``
+  and ``MastObservationsClass`` . [#1885]
 
 
 ESASky

astroquery/gemini/__init__.py

@@ -18,6 +18,6 @@ class Conf(_config.ConfigNamespace):
 
 conf = Conf()
 
-from .core import GeminiObservationsClass, GeminiObservations, Observations, ObservationsClass
+from .core import GeminiObservationsClass, GeminiObservations
 
-__all__ = ['Observations', 'ObservationsClass', 'GeminiObservations', 'GeminiObservationsClass', 'conf']
+__all__ = ['GeminiObservations', 'GeminiObservationsClass', 'conf']

astroquery/gemini/core.py

@@ -27,8 +27,7 @@
 logger = logging.getLogger(__name__)
 
 
-__all__ = ['Observations', 'ObservationsClass', 'GeminiObservations',
-           'GeminiObservationsClass']  # specifies what to import
+__all__ = ['GeminiObservations', 'GeminiObservationsClass']  # specifies what to import
 
 
 __valid_instruments__ = [
@@ -531,7 +530,7 @@ def _gemini_json_to_table(json):
         "dec"]
 
 
-@deprecated(since='v0.4.1', alternative='GeminiObservationsClass')
+@deprecated(since='v0.4.2', alternative='GeminiObservationsClass')
 class ObservationsClass(GeminiObservationsClass):
     pass
 

astroquery/mast/__init__.py

@@ -31,13 +31,12 @@ class Conf(_config.ConfigNamespace):
 conf = Conf()
 
 from .cutouts import TesscutClass, Tesscut
-from .observations import MastObservations, MastObservationsClass, MastClass, Mast, Observations, ObservationsClass
+from .observations import MastObservations, MastObservationsClass, MastClass, Mast
 from .collections import Catalogs, CatalogsClass
 from .core import MastQueryWithLogin
 from . import utils
 
 __all__ = ['MastObservations', 'MastObservationsClass',
-           'Observations', 'ObservationsClass',
            'Catalogs', 'CatalogsClass',
            'Mast', 'MastClass',
            'Tesscut', 'TesscutClass',

astroquery/mast/observations.py

@@ -40,8 +40,7 @@
 from .core import MastQueryWithLogin
 
 
-__all__ = ['Observations', 'ObservationsClass', 'MastObservations', 'MastObservationsClass',
-           'MastClass', 'Mast']
+__all__ = ['MastObservations', 'MastObservationsClass', 'MastClass', 'Mast']
 
 
 @async_to_sync
@@ -876,7 +875,7 @@ def service_request_async(self, service, params, pagesize=None, page=None, **kwa
         return self._portal_api_connection.service_request_async(service, params, pagesize, page, **kwargs)
 
 
-@deprecated(since='v0.4.1', alternative='MastObservationsClass')
+@deprecated(since='v0.4.2', alternative='MastObservationsClass')
 class ObservationsClass(MastObservationsClass):
     pass