astropy · ashleythomasbarnes · Feb 13, 2026 · Feb 13, 2026 · Feb 13, 2026 · Feb 13, 2026
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -24,7 +24,10 @@ esa.emds.einsteinprobe
 
 - New module to access the ESA Einstein Probe Science Archive. [#3511]
 
+eso
+^^^
 
+- Add functionality to list and query ESO catalogues. [#3531]
 
 API changes
 -----------

diff --git a/astroquery/eso/__init__.py b/astroquery/eso/__init__.py
@@ -9,16 +9,21 @@ class Conf(_config.ConfigNamespace):
     """
     Configuration parameters for `astroquery.eso`.
     """
-
+    MAX_ROW_LIMIT = _config.ConfigItem(
+        15000000,
+        'Maximum number of rows allowed by the TAP service.')
     ROW_LIMIT = _config.ConfigItem(
         1000,
-        'Maximum number of rows returned (set to -1 for unlimited).')
+        'Maximum number of rows returned (set to -1 for maximum allowed via TAP service).')
     username = _config.ConfigItem(
         "",
         'Optional default username for ESO archive.')
-    tap_url = _config.ConfigItem(
+    tap_obs_url = _config.ConfigItem(
         "https://archive.eso.org/tap_obs",
-        'URL for TAP queries.')
+        'URL for TAP observation queries.')
+    tap_cat_url = _config.ConfigItem(
+        "https://archive.eso.org/tap_cat",
+        'URL for TAP catalogue queries.')
 
 
 conf = Conf()

diff --git a/astroquery/eso/core.py b/astroquery/eso/core.py
diff --git a/astroquery/eso/tests/data/kids_dr4_sample.csv b/astroquery/eso/tests/data/kids_dr4_sample.csv
diff --git a/astroquery/eso/tests/data/query_list_catalogs_all_versions.csv b/astroquery/eso/tests/data/query_list_catalogs_all_versions.csv
@@ -0,0 +1,128 @@
+index,table_name
+0,AMBRE_HARPS_V1
+1,AMBRE_UVES_V1
+2,AMBRE_V1
+3,AMUSED_MAIN_SOURCE_CAT_V1
+4,ATLASGAL_V1
+5,COSMOS2015_Laigle_v1_1b_latestV7_fits_V1
+6,COSMOS2020_CLASSIC_V2
+7,COSMOS2020_FARMER_V1
+8,COSMOS2020_FARMER_V2
+9,EREBOS_RV_cat_fits_V1
+10,EREBOS_cat_fits_V1
+11,FDS_SourceCatalogue_V1
+12,GES_2021_VRAD
+13,GES_DR5
+14,GES_DR5_1_V1
+15,GES_iDR4_PIII2016_Catalogue_v3_fits_V2
+16,GNS_catalogue_V1
+17,GOODS_FORS2_V1
+18,GOODS_ISAAC_V1
+19,GOODS_VIMOS_SPEC_V1
+20,HARPS_RVCAT_V1
+21,HUGS_GOODSS_K_V1
+22,HUGS_UDS_K_V1
+23,HUGS_UDS_Y_V1
+24,INSPIRE_V1
+25,KiDS_DR3_0_ugri_src_fits_V2
+26,KiDS_DR3_1_ugri_shear_fits_V1
+27,KiDS_DR4_0_ugriZYJHKs_cat_fits_V3
+28,KiDS_DR4_1_ugriZYJHKs_cat_fits
+29,KiDS_DR5_0_ugriZYJHKs_cat_fits
+30,MW_BULGE_PSFPHOT_V1
+31,NGTS_LC_CATALOGUE_fits_V1
+32,NGTS_LC_V2
+33,NGTS_SOURCE_CATALOGUE_fits_V1
+34,NGTS_SOURCE_CAT_V2
+35,PESSTO_MPHOT_V3
+36,PESSTO_MPHOT_fits_V2
+37,PESSTO_TRAN_CAT_V3
+38,PESSTO_TRAN_CAT_fits_V2
+39,PHANGS_DR1_NebCat
+40,UVISTA_5band_cat_dr4_rc_v2_fits_V3
+41,UVISTA_5band_cat_dr5_rc_v1_fits_V4
+42,UVISTA_5band_cat_dr6_rc_v1_fits_V5
+43,UltraVISTA_V3
+44,VANDELS_META_SPECTRO_fits_V1
+45,VANDELS_META_SPECTRO_fits_V2
+46,VANDELS_SPECTRO_V4
+47,VANDELS_spec_redshift_V3
+48,VEXAS_21_V1
+49,VEXAS_AllWISE_V1
+50,VEXAS_DESW_V1
+51,VEXAS_DESW_V2
+52,VEXAS_PS1W_V1
+53,VEXAS_PSW_V2
+54,VEXAS_SMW_V1
+55,VEXAS_SMW_V2
+56,VEXAS_SPEC_GOOD_V2
+57,VEXAS_SPEC_V1
+58,VEXAS_XRAY_V1
+59,VHS_CAT_V2
+60,VHS_CAT_V3
+61,VIDEO_CAT_DR5
+62,VIPERS_SPECTRO_PDR2_ESO_fits_V1
+63,VVVX_VIRAC_V2_LC
+64,VVVX_VIRAC_V2_OBS
+65,VVVX_VIRAC_V2_REJECTED_LC
+66,VVVX_VIRAC_V2_REJECTED_SOURCES
+67,VVVX_VIRAC_V2_SOURCES
+68,VVV_CAT_V2
+69,VVV_MPHOT_Ks_V2
+70,VVV_VAR_V2
+71,VVV_VIRAC_PM_V1
+72,VVV_bandMergedSourceCat_V3
+73,XQ_100_summary_fits_V1
+74,ZCOSMOS_V2
+75,atlas_er3_ugriz_catMetaData_fits_V2
+76,atlas_er4_ugriz_catMetaData_fits_V3
+77,atlas_er5_ugriz
+78,gcav_rxcj1515_YJKs_cat_fits_V1
+79,gcav_rxcj2129_YJKs_cat_fits_V1
+80,legac_DR1_fits_V1
+81,legac_DR2_fits_V2
+82,legac_V3
+83,video_er3_zyjhks_CDFS_catMetaData_fits_V2
+84,video_er3_zyjhks_ES1_catMetaData_fits_V2
+85,video_er3_zyjhks_XMM_catMetaData_fits_V3
+86,viking_er4_zyjj_1j_2hks_catMetaData_fits_V3
+87,viking_er5_zyjj_1j_2hks_catMetaData_fits_V4
+88,vmc_dr5_mPhotJ_V4
+89,vmc_dr5_mPhotKs_V4
+90,vmc_dr5_mPhotY_V4
+91,vmc_dr5_psf_yjks_V3
+92,vmc_dr5_sourceCat_yjks_V4
+93,vmc_dr5_var_yjKs_V1
+94,vmc_dr6_ksjy_V5
+95,vmc_dr6_mPhotJ_V5
+96,vmc_dr6_mPhotKs_V5
+97,vmc_dr6_mPhotY_V5
+98,vmc_dr6_yjks_psf_V4
+99,vmc_dr6_yjks_varCat_V2
+100,vmc_dr7_ksjy_V6
+101,vmc_dr7_mPhotJ_V6
+102,vmc_dr7_mPhotKs_V6
+103,vmc_dr7_mPhotY_V6
+104,vmc_dr7_yjks_MlClass_V1
+105,vmc_dr7_yjks_agbVar_V1
+106,vmc_dr7_yjks_back_V1
+107,vmc_dr7_yjks_chephVar_V4
+108,vmc_dr7_yjks_eclBinVar_V3
+109,vmc_dr7_yjks_extJKs_V1
+110,vmc_dr7_yjks_extYKs_V1
+111,vmc_dr7_yjks_lpvVar_V1
+112,vmc_dr7_yjks_pm_V1
+113,vmc_dr7_yjks_psfSrc_V5
+114,vmc_dr7_yjks_qsos_V1
+115,vmc_dr7_yjks_rrLy_V2
+116,vmc_dr7_yjks_varCat_V3
+117,vmc_dr7_yjks_ysoVar_V1
+118,vmc_er4_j_mPhotMetaData_fits_V3
+119,vmc_er4_ks_mPhotMetaData_fits_V3
+120,vmc_er4_ksjy_catMetaData_fits_V3
+121,vmc_er4_y_mPhotMetaData_fits_V3
+122,vmc_er4_yjks_cepheidCatMetaData_fits_V3
+123,vmc_er4_yjks_eclBinCatMetaData_fits_V2
+124,vmc_er4_yjks_psfCatMetaData_fits_V2
+125,vmc_er4_yjks_rrLyrCatMetaData_fits_V1
+126,vphas_er3_ugr_1r_2ihavphas_catMetaData_fits_V3
diff --git a/astroquery/eso/tests/data/query_list_catalogs_latest_versions.csv b/astroquery/eso/tests/data/query_list_catalogs_latest_versions.csv
@@ -0,0 +1,85 @@
+index,table_name
+0,AMBRE_HARPS_V1
+1,AMBRE_UVES_V1
+2,AMBRE_V1
+3,AMUSED_MAIN_SOURCE_CAT_V1
+4,ATLASGAL_V1
+5,COSMOS2015_Laigle_v1_1b_latestV7_fits_V1
+6,COSMOS2020_CLASSIC_V2
+7,COSMOS2020_FARMER_V2
+8,EREBOS_RV_cat_fits_V1
+9,EREBOS_cat_fits_V1
+10,FDS_SourceCatalogue_V1
+11,GES_2021_VRAD
+12,GES_DR5_1_V1
+13,GNS_catalogue_V1
+14,GOODS_FORS2_V1
+15,GOODS_ISAAC_V1
+16,GOODS_VIMOS_SPEC_V1
+17,HARPS_RVCAT_V1
+18,HUGS_GOODSS_K_V1
+19,HUGS_UDS_K_V1
+20,HUGS_UDS_Y_V1
+21,INSPIRE_V1
+22,KiDS_DR3_0_ugri_src_fits_V2
+23,KiDS_DR3_1_ugri_shear_fits_V1
+24,KiDS_DR4_1_ugriZYJHKs_cat_fits
+25,KiDS_DR5_0_ugriZYJHKs_cat_fits
+26,MW_BULGE_PSFPHOT_V1
+27,NGTS_LC_V2
+28,NGTS_SOURCE_CAT_V2
+29,PESSTO_MPHOT_V3
+30,PESSTO_TRAN_CAT_V3
+31,PHANGS_DR1_NebCat
+32,UVISTA_5band_cat_dr6_rc_v1_fits_V5
+33,VANDELS_SPECTRO_V4
+34,VANDELS_spec_redshift_V3
+35,VEXAS_21_V1
+36,VEXAS_AllWISE_V1
+37,VEXAS_DESW_V2
+38,VEXAS_PSW_V2
+39,VEXAS_SMW_V2
+40,VEXAS_SPEC_GOOD_V2
+41,VEXAS_SPEC_V1
+42,VEXAS_XRAY_V1
+43,VHS_CAT_V3
+44,VIDEO_CAT_DR5
+45,VIPERS_SPECTRO_PDR2_ESO_fits_V1
+46,VVVX_VIRAC_V2_LC
+47,VVVX_VIRAC_V2_OBS
+48,VVVX_VIRAC_V2_REJECTED_LC
+49,VVVX_VIRAC_V2_REJECTED_SOURCES
+50,VVVX_VIRAC_V2_SOURCES
+51,VVV_MPHOT_Ks_V2
+52,VVV_VAR_V2
+53,VVV_VIRAC_PM_V1
+54,VVV_bandMergedSourceCat_V3
+55,XQ_100_summary_fits_V1
+56,ZCOSMOS_V2
+57,atlas_er5_ugriz
+58,gcav_rxcj1515_YJKs_cat_fits_V1
+59,gcav_rxcj2129_YJKs_cat_fits_V1
+60,legac_V3
+61,video_er3_zyjhks_CDFS_catMetaData_fits_V2
+62,video_er3_zyjhks_ES1_catMetaData_fits_V2
+63,video_er3_zyjhks_XMM_catMetaData_fits_V3
+64,viking_er5_zyjj_1j_2hks_catMetaData_fits_V4
+65,vmc_dr7_ksjy_V6
+66,vmc_dr7_mPhotJ_V6
+67,vmc_dr7_mPhotKs_V6
+68,vmc_dr7_mPhotY_V6
+69,vmc_dr7_yjks_MlClass_V1
+70,vmc_dr7_yjks_agbVar_V1
+71,vmc_dr7_yjks_back_V1
+72,vmc_dr7_yjks_chephVar_V4
+73,vmc_dr7_yjks_eclBinVar_V3
+74,vmc_dr7_yjks_extJKs_V1
+75,vmc_dr7_yjks_extYKs_V1
+76,vmc_dr7_yjks_lpvVar_V1
+77,vmc_dr7_yjks_pm_V1
+78,vmc_dr7_yjks_psfSrc_V5
+79,vmc_dr7_yjks_qsos_V1
+80,vmc_dr7_yjks_rrLy_V2
+81,vmc_dr7_yjks_varCat_V3
+82,vmc_dr7_yjks_ysoVar_V1
+83,vphas_er3_ugr_1r_2ihavphas_catMetaData_fits_V3
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,10 @@ esa.emds.einsteinprobe @@
     - New module to access the ESA Einstein Probe Science Archive. [#3511]
+    eso
+    ^^^
+    - Add functionality to list and query ESO catalogues. [#3531]
     API changes
     -----------
@@ Expand Down @@