Merge branch 'main' into to-iris

Author: charles-turner-1

docs/source/how-to/enforce-search-query-criteria-via-require-all-on.md

@@ -12,7 +12,7 @@ kernelspec:
 ```{code-cell} ipython3
 import intake
 
-url = "https://raw.githubusercontent.com/intake/intake-esm/main/tutorial-catalogs/GOOGLE-CMIP6.json"
+url = "https://storage.googleapis.com/cmip6/pangeo-cmip6.json"
 cat = intake.open_esm_datastore(url)
 cat
 ```
@@ -31,7 +31,7 @@ multiple experiment_ids from the Omon table_id, all from 3 different source_ids:
 ```{code-cell} ipython3
 # Define our query
 query = dict(
-    variable_id=["tos", "o2"],
+    variable_id=["thetao", "o2", "tos"],
     experiment_id=["historical", "ssp585"],
     table_id=["Omon"],
     source_id=["ACCESS-ESM1-5", "AWI-CM-1-1-MR", "FGOALS-f3-L"],
@@ -54,10 +54,10 @@ cat_subset.df.groupby("source_id")[["experiment_id", "variable_id", "table_id"]]
 ```
 
 As you can see, the search results above include source_ids for which we only
-have one of the two variables, and one or two of the two
+have one or two of the three variables, and one of the two experiment ids.
 
-We can tell intake-esm to discard any source_id that doesn’t have both variables
-`["tos", "o2"]` and both experiments
+We can tell intake-esm to discard any source_id that doesn’t have all three variables
+`["thetao", "o2", "tos"]` and both experiments
 `["historical", "ssp585"]` by passing `require_all_on=["source_id"]`
 to the search method:
 

tests/test_core.py

@@ -259,18 +259,6 @@ def test_catalog_search_columns_with_iterables(path, columns_with_iterables, que
     assert len(new_cat) == expected_size
 
 
-@pytest.mark.parametrize(
-    'path, columns_with_iterables, query, expected_size',
-    [
-        (access_columns_with_iterables_cat, ['variable'], {'variable': ['aice_m']}, 1),
-    ],
-)
-def test_catalog_search_columns_with_iterables(path, columns_with_iterables, query, expected_size):
-    cat = intake.open_esm_datastore(path, columns_with_iterables=columns_with_iterables)
-    new_cat = cat.search(**query)
-    assert len(new_cat) == expected_size
-
-
 def test_catalog_with_registry_search():
     cat = intake.open_esm_datastore(zarr_cat_aws_cesm, registry=registry)
     new_cat = cat.search(variable='FOO')

tests/test_source.py

@@ -91,7 +91,7 @@ def test_open_dataset_kerchunk(kerchunk_file=kerchunk_file):
         urlpath=kerchunk_file,
         varname=None,
         xarray_open_kwargs=xarray_open_kwargs,
-    ).compute()
+    )
     assert isinstance(ds, xarray.Dataset)