Fix CMR-related type hints

CONTRIBUTING.md

@@ -84,6 +84,15 @@ Finally, for _development dependencies only_, you must add an entry to
 make format lint
 ```
 
+We attempt to provide comprehensive type annotations within this repository.  If
+you do not provide fully annotated functions or methods, the `lint` command will
+fail.  Over time, we plan to increase type-checking strictness in order to
+ensure more precise, beneficial type annotations.
+
+We have included type stubs for the untyped `python-cmr` library, which we
+intend to eventually upstream.  Since `python-cmr` exposes the `cmr` package,
+the stubs appear under `stubs/cmr`.
+
 ### Requirements to merge code (Pull Request Process)
 
 - you must include test coverage

ci/environment-mindeps.yaml

@@ -17,6 +17,7 @@ dependencies:
   - multimethod=1.8
   - python-dateutil=2.8.2
   - importlib-resources=6.3.2
+  - typing-extensions=4.10.0
   # test dependencies
   - responses
   - pytest

earthaccess/api.py

@@ -1,14 +1,14 @@
 import requests
 import s3fs
 from fsspec import AbstractFileSystem
+from typing_extensions import Any, Dict, List, Optional, Union
 
 import earthaccess
 
 from .auth import Auth
 from .results import DataCollection, DataGranule
 from .search import CollectionQuery, DataCollections, DataGranules, GranuleQuery
 from .store import Store
-from .typing_ import Any, Dict, List, Optional, Union
 from .utils import _validation as validate
 
 

earthaccess/search.py

@@ -3,13 +3,7 @@
 
 import dateutil.parser as parser
 import requests
-
-from cmr import CollectionQuery, GranuleQuery
-
-from .auth import Auth
-from .daac import find_provider, find_provider_by_shortname
-from .results import DataCollection, DataGranule
-from .typing_ import (
+from typing_extensions import (
     Any,
     List,
     Optional,
@@ -22,6 +16,12 @@
     override,
 )
 
+from cmr import CollectionQuery, GranuleQuery
+
+from .auth import Auth
+from .daac import find_provider, find_provider_by_shortname
+from .results import DataCollection, DataGranule
+
 FloatLike: TypeAlias = Union[str, SupportsFloat]
 PointLike: TypeAlias = Tuple[FloatLike, FloatLike]
 

pyproject.toml

@@ -45,6 +45,7 @@ python-dateutil = ">=2.8.2"
 kerchunk = { version = ">=0.1.2", optional = true }
 dask = { version = ">=2022.1.0", optional = true }
 importlib-resources = ">=6.3.2"
+typing_extensions = ">=4.10.0"
 
 [tool.poetry.extras]
 kerchunk = ["kerchunk", "dask"]