Rename _types module to cat (#381)

intake · Oct 15, 2021 · dce1b90 · dce1b90
1 parent 226e59c
commit dce1b90
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/intake_esm/_search.py b/intake_esm/_search.py
@@ -5,7 +5,7 @@
 import pandas as pd
 
 if typing.TYPE_CHECKING:
-    from ._types import QueryModel
+    from .cat import QueryModel
 
 import warnings
 

diff --git a/intake_esm/_types.py → intake_esm/cat.py b/intake_esm/_types.py → intake_esm/cat.py
diff --git a/intake_esm/core.py b/intake_esm/core.py
@@ -10,7 +10,7 @@
 from fastprogress.fastprogress import progress_bar
 from intake.catalog import Catalog
 
-from ._types import ESMCatalogModel
+from .cat import ESMCatalogModel
 from .derived import DerivedVariableRegistry, default_registry
 from .source import ESMDataSource
 

diff --git a/intake_esm/source.py b/intake_esm/source.py
@@ -7,7 +7,7 @@
 import xarray as xr
 from intake.source.base import DataSource, Schema
 
-from ._types import Aggregation, DataFormat
+from .cat import Aggregation, DataFormat
 from .utils import INTAKE_ESM_ATTRS_PREFIX, INTAKE_ESM_DATASET_KEY, INTAKE_ESM_VARS_KEY
 
 

diff --git a/tests/test_types.py → tests/test_cat.py b/tests/test_types.py → tests/test_cat.py
@@ -2,7 +2,7 @@
 import pydantic
 import pytest
 
-from intake_esm._types import Assets, ESMCatalogModel, QueryModel
+from intake_esm.cat import Assets, ESMCatalogModel, QueryModel
 
 from .utils import (
     catalog_dict_records,

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -49,7 +49,7 @@ def funcs(ds):
 def test_catalog_init(capsys, obj, sep, read_csv_kwargs):
     """Test that the catalog can be initialized."""
     cat = intake.open_esm_datastore(obj, sep=sep, read_csv_kwargs=read_csv_kwargs)
-    assert isinstance(cat.esmcat, intake_esm._types.ESMCatalogModel)
+    assert isinstance(cat.esmcat, intake_esm.cat.ESMCatalogModel)
     assert isinstance(cat.df, pd.DataFrame)
     assert len(cat) > 0
 

diff --git a/tests/test_search.py b/tests/test_search.py
@@ -4,7 +4,7 @@
 import pytest
 
 from intake_esm._search import is_pattern, search, search_apply_require_all_on
-from intake_esm._types import QueryModel
+from intake_esm.cat import QueryModel
 
 
 @pytest.mark.parametrize(