Merge pull request #2596 from AlinderS/update-gaia-defaults

GAIA: Update default Gaia data release to DR3

Author: bsipocz

CHANGES.rst

@@ -174,6 +174,8 @@ gaia
   With this change the epoch photometry service returns all data associated
   to a given source. [#2376]
 
+- Default Gaia catalog updated to DR3. [#2596]
+
 sdss
 ^^^^
 

astroquery/gaia/__init__.py

@@ -22,7 +22,7 @@ class Conf(_config.ConfigNamespace):
     Configuration parameters for `astroquery.gaia`.
     """
 
-    MAIN_GAIA_TABLE = _config.ConfigItem("gaiadr2.gaia_source",
+    MAIN_GAIA_TABLE = _config.ConfigItem("gaiadr3.gaia_source",
                                          "GAIA source data table")
     MAIN_GAIA_TABLE_RA = _config.ConfigItem("ra",
                                             "Name of RA parameter in table")

astroquery/gaia/core.py

@@ -173,7 +173,7 @@ def load_data(self, ids, data_release=None, data_structure='INDIVIDUAL', retriev
         ids : str list, mandatory
             list of identifiers
         data_release: str, optional, default None
-            data release from which data should be taken. E.g. 'Gaia DR2'
+            data release from which data should be taken. E.g. 'Gaia DR3'
             By default, it takes the current default one.
         data_structure: str, optional, default 'INDIVIDUAL'
             it can be 'INDIVIDUAL', 'COMBINED', 'RAW':
@@ -187,8 +187,8 @@ def load_data(self, ids, data_release=None, data_structure='INDIVIDUAL', retriev
             row per sourceId
         retrieval_type : str, optional, default 'ALL' to retrieve all data  from the list of sources
             retrieval type identifier. For GAIA DR2 possible values are ['EPOCH_PHOTOMETRY']
-            For future GAIA DR3 (Once published), possible values will be ['EPOC_PHOTOMETRY', 'RVS', 'XP_CONTINUOUS',
-            'XP_SAMPLED', 'MCMC_GSPPHOT' or 'MCMC_MSC']
+            For GAIA DR3, possible values are ['EPOC_PHOTOMETRY', 'RVS', 'XP_CONTINUOUS', 'XP_SAMPLED',
+            'MCMC_GSPPHOT' or 'MCMC_MSC']
         valid_data : bool, optional, default False
             By default, the epoch photometry service returns all available data, including
             data rows where flux is null and/or the rejected_by_photometry flag is set to True.

astroquery/gaia/tests/test_gaia_remote.py

@@ -32,7 +32,7 @@ def test_query_object_row_limit():
     Gaia.ROW_LIMIT = -1
     r = Gaia.query_object_async(coordinate=coord, width=width, height=height)
 
-    assert len(r) == 176
+    assert len(r) == 184
 
 
 @pytest.mark.remote_data
@@ -55,4 +55,4 @@ def test_cone_search_row_limit():
     j = Gaia.cone_search_async(coord, radius)
     r = j.get_results()
 
-    assert len(r) == 1188
+    assert len(r) == 1218

astroquery/gaia/tests/test_gaiatap.py

@@ -178,7 +178,7 @@ def test_cone_search_async(column_attrs, mock_querier_async):
     # Regression test for #2093 and #2099 - changing the MAIN_GAIA_TABLE
     # had no effect.
     # The preceding tests should have used the default value.
-    assert 'gaiadr2.gaia_source' in job.parameters['query']
+    assert 'gaiadr3.gaia_source' in job.parameters['query']
     with conf.set_temp("MAIN_GAIA_TABLE", "name_from_conf"):
         job = mock_querier_async.cone_search_async(skycoord, radius)
         assert "name_from_conf" in job.parameters["query"]