renamed and deprecated Observations and Observations class

renamed and deprecated Observations and Observations class in mast module

added changelog entry

gemini observations old syntax now works

gemini observations old syntax still works

added old syntax to init

some corrections

mast observations old syntax still works

changes requested

updated gemini doc

updated mast doc

renamed and deprecated Observations and Observations class

Author: tinuademargaret

CHANGES.rst

@@ -27,6 +27,12 @@ esa.xmm_newton
 - Use astroquery downloader tool to get progressbar, caching, and prevent
   memory leaks [#2087]
 
+observations
+^^^^^^^^^^^^
+
+- Renamed and deprecated Observations and ObservationsClass in MAST
+  and GEMINI modules. [#1885]
+
 gaia
 ^^^^
 

astroquery/gemini/__init__.py

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

astroquery/gemini/core.py

@@ -11,6 +11,7 @@
 from astroquery import log
 from astropy import units
 from astropy.table import Table, MaskedColumn
+from astropy.utils import deprecated
 
 from astroquery.gemini.urlhelper import URLHelper
 import numpy as np
@@ -21,7 +22,13 @@
 from ..exceptions import AuthenticationWarning
 
 
-__all__ = ['Observations', 'ObservationsClass']  # specifies what to import
+<<<<<<< HEAD
+=======
+logger = logging.getLogger(__name__)
+
+
+>>>>>>> changes requested
+__all__ = ['GeminiObservations', 'GeminiObservationsClass']  # specifies what to import
 
 
 __valid_instruments__ = [
@@ -97,7 +104,7 @@
 ]
 
 
-class ObservationsClass(QueryWithLogin):
+class GeminiObservationsClass(QueryWithLogin):
 
     server = conf.server
     url_helper = URLHelper(server)
@@ -526,4 +533,11 @@ def _gemini_json_to_table(json):
         "release",
         "dec"]
 
+
+@deprecated(since='v0.4.2', alternative='GeminiObservationsClass')
+class ObservationsClass(GeminiObservationsClass):
+    pass
+
+
+GeminiObservations = GeminiObservationsClass()
 Observations = ObservationsClass()

astroquery/gemini/tests/test_gemini.py

@@ -68,14 +68,14 @@ def data_path(filename):
 
 def test_observations_query_region(patch_get):
     """ test query against a region of the sky """
-    result = gemini.Observations.query_region(coords, radius=0.3 * units.deg)
+    result = gemini.GeminiObservations.query_region(coords, radius=0.3 * units.deg)
     assert isinstance(result, Table)
     assert len(result) > 0
 
 
 def test_observations_query_criteria(patch_get):
     """ test query against an instrument/program via criteria """
-    result = gemini.Observations.query_criteria(instrument='GMOS-N', program_id='GN-CAL20191122',
+    result = gemini.GeminiObservations.query_criteria(instrument='GMOS-N', program_id='GN-CAL20191122',
                                                 observation_type='BIAS',
                                                 utc_date=(date(2019, 10, 1), date(2019, 11, 25)))
     assert isinstance(result, Table)
@@ -103,7 +103,7 @@ def test_observations_query_criteria_radius_defaults(patch_get):
 
 def test_observations_query_raw(patch_get):
     """ test querying raw """
-    result = gemini.Observations.query_raw('GMOS-N', 'BIAS', progid='GN-CAL20191122')
+    result = gemini.GeminiObservations.query_raw('GMOS-N', 'BIAS', progid='GN-CAL20191122')
     assert isinstance(result, Table)
     assert len(result) > 0
 

astroquery/gemini/tests/test_remote.py

@@ -28,20 +28,20 @@
 class TestGemini:
     def test_observations_query_region(self):
         """ test query against a region of the sky against actual archive """
-        result = gemini.Observations.query_region(coords, radius=0.3 * units.deg)
+        result = gemini.GeminiObservations.query_region(coords, radius=0.3 * units.deg)
         assert isinstance(result, Table)
         assert len(result) > 0
 
     def test_observations_query_criteria(self):
         """ test query against an instrument/program via criteria against actual archive """
-        result = gemini.Observations.query_criteria(instrument='GMOS-N', program_id='GN-CAL20191122',
+        result = gemini.GeminiObservations.query_criteria(instrument='GMOS-N', program_id='GN-CAL20191122',
                                                     observation_type='BIAS')
         assert isinstance(result, Table)
         assert len(result) > 0
 
     def test_observations_query_criteria_ascending_sort(self):
         """ test query against an instrument/program via criteria against actual archive """
-        result = gemini.Observations.query_criteria(instrument='GMOS-N', program_id='GN-CAL20191122',
+        result = gemini.GeminiObservations.query_criteria(instrument='GMOS-N', program_id='GN-CAL20191122',
                                                     observation_type='BIAS', orderby='filename_asc')
         assert isinstance(result, Table)
         assert len(result) > 0
@@ -52,7 +52,7 @@ def test_observations_query_criteria_ascending_sort(self):
 
     def test_observations_query_criteria_descending_sort(self):
         """ test query against an instrument/program via criteria against actual archive """
-        result = gemini.Observations.query_criteria(instrument='GMOS-N', program_id='GN-CAL20191122',
+        result = gemini.GeminiObservations.query_criteria(instrument='GMOS-N', program_id='GN-CAL20191122',
                                                     observation_type='BIAS', orderby='filename_desc')
         assert isinstance(result, Table)
         assert len(result) > 0
@@ -62,15 +62,15 @@ def test_observations_query_criteria_descending_sort(self):
 
     def test_observations_query_raw(self):
         """ test querying raw against actual archive """
-        result = gemini.Observations.query_raw('GMOS-N', 'BIAS', progid='GN-CAL20191122')
+        result = gemini.GeminiObservations.query_raw('GMOS-N', 'BIAS', progid='GN-CAL20191122')
         assert isinstance(result, Table)
         assert len(result) > 0
 
     def test_get_file(self):
         """ test querying raw against actual archive """
         tempdir = tempfile.mkdtemp('_gemini_test')
         filename = '20190105_GN-CAL20190105_obslog.txt'
-        gemini.Observations.get_file(filename, download_dir=tempdir)
+        gemini.GeminiObservations.get_file(filename, download_dir=tempdir)
         filepath = os.path.join(tempdir, filename)
         assert os.path.isfile(filepath)
         assert os.stat(filepath).st_size == 7624

astroquery/mast/__init__.py

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

astroquery/mast/observations.py

@@ -39,12 +39,11 @@
 from .core import MastQueryWithLogin
 
 
-__all__ = ['Observations', 'ObservationsClass',
-           'MastClass', 'Mast']
+__all__ = ['MastObservations', 'MastObservationsClass', 'MastClass', 'Mast']
 
 
 @async_to_sync
-class ObservationsClass(MastQueryWithLogin):
+class MastObservationsClass(MastQueryWithLogin):
     """
     MAST Observations query class.
 
@@ -795,7 +794,7 @@ class MastClass(MastQueryWithLogin):
     MAST query class.
 
     Class that allows direct programatic access to the MAST Portal,
-    more flexible but less user friendly than `ObservationsClass`.
+    more flexible but less user friendly than `MastObservationsClass`.
     """
 
     def _parse_result(self, responses, verbose=False):  # Used by the async_to_sync decorator functionality
@@ -852,5 +851,11 @@ 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.2', alternative='MastObservationsClass')
+class ObservationsClass(MastObservationsClass):
+    pass
+
+
+MastObservations = MastObservationsClass()
 Observations = ObservationsClass()
 Mast = MastClass()