Merge pull request #651 from ungarj/aiohttp_dependency

add aiohttp to dependencies

mapchete/commands/execute.py

@@ -42,7 +42,7 @@ def execute(
     executor_getter: AbstractContextManager = Executor,
     profiling: bool = False,
     observers: Optional[List[ObserverProtocol]] = None,
-    retry_on_exception: Tuple[Type[Exception], Type[Exception]] = Exception,
+    retry_on_exception: Union[Tuple[Type[Exception], ...], Type[Exception]] = Exception,
     cancel_on_exception: Type[Exception] = JobCancelledError,
     retries: int = 0,
 ):

mapchete/path.py

@@ -12,6 +12,7 @@
 from io import TextIOWrapper
 from typing import IO, Generator, List, Optional, Set, TextIO, Tuple, Union
 
+from aiohttp import BasicAuth
 import fiona
 import fsspec
 import oyaml as yaml
@@ -175,8 +176,6 @@ def fs(self) -> fsspec.AbstractFileSystem:
         elif self._path_str.startswith(("http://", "https://")):
             username = self._storage_options.get("username")
             if username:
-                from aiohttp import BasicAuth
-
                 auth = BasicAuth(
                     login=username,
                     password=self._storage_options.get("password", ""),

pyproject.toml

@@ -21,6 +21,7 @@ classifiers = [
     "Topic :: Scientific/Engineering :: GIS",
 ]
 dependencies = [
+    "aiohttp",
     "cachetools",
     "click-plugins",
     "click-spinner",