Merge pull request #296 from bsipocz/IRSA_include_metadata

Add mention of 'include_metadata_tables'

Author: bsipocz

tox.ini

@@ -66,6 +66,9 @@ commands =
 
     buildhtml: bash -c 'cat ignore_tutorials/ignore_rendering_execution >> ignore_testing'
 
+    # We use astroquery 0.4.11+ feature in some of the notebooks, ignore them for oldestdeps testing
+    oldestdeps: bash -c 'for i in tutorials/euclid/4_Euclid_intro_PHZ_catalog tutorials/euclid/5_Euclid_intro_SPE_catalog tutorials/euclid/euclid-cloud-access; do echo $i ; done >> ignore_testing'
+
     # Make a list of all the tutorials to be reused in multiple filtering commands below
     bash -c 'find tutorials -name "*md" | xargs grep kernelspec: | awk -F :kernelspec: "{print \$1}" > all_tutorials'
 

tutorials/euclid/4_Euclid_intro_PHZ_catalog.md

@@ -67,7 +67,7 @@ We rely on ``astroquery`` features that have been recently added, so please make
 
 ```{code-cell} ipython3
 # Uncomment the next line to install dependencies if needed.
-# !pip install matplotlib 'astropy>=5.3' 'astroquery>=0.4.10' fsspec firefly_client
+# !pip install matplotlib 'astropy>=5.3' 'astroquery>=0.4.11' fsspec firefly_client
 ```
 
 ```{code-cell} ipython3
@@ -139,10 +139,17 @@ print(f'The MER tile ID for this object is : {tileID}')
 
 ## 2. Download PHZ catalog from IRSA
 
-Use IRSA's TAP to search catalogs
+Use IRSA's TAP to search catalogs and metadata tables associated with Euclid:
+
+
+```{note}
+In the example below, we use ``include_metadata_tables=True``.
+This parameter was introduced in astroquery 0.4.11. For earlier versions, please omit this parameter to receive the combined list of available catalogs and metadata tables.
+```
+
 
 ```{code-cell} ipython3
-Irsa.list_catalogs(filter='euclid')
+Irsa.list_catalogs(filter='euclid', include_metadata_tables=True)
 ```
 
 ```{code-cell} ipython3

tutorials/euclid/5_Euclid_intro_SPE_catalog.md

@@ -67,7 +67,7 @@ We rely on ``astroquery`` features that have been recently added, so please make
 
 ```{code-cell} ipython3
 # Uncomment the next line to install dependencies if needed
-# %pip install matplotlib astropy 'astroquery>=0.4.10'
+# %pip install matplotlib astropy 'astroquery>=0.4.11'
 ```
 
 ```{code-cell} ipython3
@@ -154,10 +154,15 @@ print(f'The MER tile ID for this object is : {tileID}')
 
 ## 2. Download SPE catalog from IRSA directly to this notebook
 
-Search for all tables in IRSA labeled as euclid
+Search for all Euclid catalogs and metadata tables in IRSA:
+
+```{note}
+In the example below, we use ``include_metadata_tables=True``.
+This parameter was introduced in astroquery 0.4.11. For earlier versions, please omit this parameter to receive the combined list of available catalogs and metadata tables.
+```
 
 ```{code-cell} ipython3
-Irsa.list_catalogs(filter='euclid')
+Irsa.list_catalogs(filter='euclid', include_metadata_tables=True)
 ```
 
 ```{code-cell} ipython3

tutorials/euclid/euclid-cloud-access.md

@@ -59,7 +59,7 @@ We rely on ``astroquery`` features that have been recently added, so please make
 
 ```{code-cell} ipython3
 # Uncomment the next line to install dependencies if needed.
-# !pip install s3fs astropy 'astroquery>=0.4.10' matplotlib
+# !pip install s3fs astropy 'astroquery>=0.4.11' matplotlib
 ```
 
 ```{code-cell} ipython3
@@ -240,14 +240,19 @@ Once the catalogs are available as Parquet files in the cloud, we can efficientl
 +++
 
 ## 7. Find the MER Object ID for our target
-First, list the Euclid catalogs provided by IRSA:
+First, list the Euclid catalogs provided by IRSA.
+
+```{note}
+In the example below, we use ``include_metadata_tables=True``.
+This parameter was introduced in astroquery 0.4.11. For earlier versions, please omit this parameter to receive the combined list of available catalogs and metadata tables.
+```
 
 ```{code-cell} ipython3
-catalogs = Irsa.list_catalogs(full=True, filter='euclid')
+catalogs = Irsa.list_catalogs(full=True, filter='euclid', include_metadata_tables=True)
 catalogs
 ```
 
-From this table, we can extract the MER catalog name. We also see several other interesting catalogs, let's also extract spectral file association catalog for retrieving spectra later.
+From this table, we can extract the MER catalog name. We also see several other interesting metadata tables, let's also extract spectral file association table for retrieving spectra later.
 
 ```{code-cell} ipython3
 euclid_mer_catalog = 'euclid_q1_mer_catalogue'