Merge branch 'master' of github.com:aio-libs/aiodocker

aiodocker/images.py

@@ -42,8 +42,8 @@ async def history(self, name: str) -> Mapping:
 
     async def pull(self, from_image: str, *,
                    auth: Optional[Union[MutableMapping, str, bytes]]=None,
-                   tag: Optional[str]=None,
-                   repo: Optional[str]=None,
+                   tag: str=None,
+                   repo: str=None,
                    stream: bool=False) -> Mapping:
         """
         Similar to `docker pull`, pull an image locally
@@ -81,7 +81,7 @@ async def pull(self, from_image: str, *,
 
     async def push(self, name: str, *,
                    auth: Union[MutableMapping, str, bytes]=None,
-                   tag: Optional[str]=None,
+                   tag: str=None,
                    stream: bool=False) -> Mapping:
         params = {}
         headers = {
@@ -105,7 +105,7 @@ async def push(self, name: str, *,
         return (await json_stream_result(response, stream=stream))
 
     async def tag(self, name: str, repo: str, *,
-                  tag: Optional[str]=None) -> bool:
+                  tag: str=None) -> bool:
         """
         Tag the given image so that it becomes part of a repository.
 
@@ -150,19 +150,19 @@ async def delete(self, name: str, *, force: bool=False,
         return response
 
     async def build(self, *,
-                    remote: Optional[str]=None,
-                    fileobj: Optional[BinaryIO]=None,
-                    path_dockerfile: Optional[str]=None,
-                    tag: Optional[str]=None,
+                    remote: str=None,
+                    fileobj: BinaryIO=None,
+                    path_dockerfile: str=None,
+                    tag: str=None,
                     quiet: bool=False,
                     nocache: bool=False,
-                    buildargs: Optional[Mapping]=None,
+                    buildargs: Mapping=None,
                     pull: bool=False,
                     rm: bool=True,
                     forcerm: bool=False,
-                    labels: Optional[Mapping]=None,
+                    labels: Mapping=None,
                     stream: bool=False,
-                    encoding: Optional[str]=None) -> Mapping:
+                    encoding: str=None) -> Mapping:
         """
         Build an image given a remote Dockerfile
         or a file object with a Dockerfile inside

aiodocker/nodes.py

@@ -1,12 +1,12 @@
-from typing import Any, Dict, List
+from typing import Any, List, Mapping
 from .utils import clean_filters
 
 
 class DockerSwarmNodes(object):
     def __init__(self, docker):
         self.docker = docker
 
-    async def list(self, *, filters: Dict=None) -> List[Dict]:
+    async def list(self, *, filters: Mapping=None) -> List[Mapping]:
         """
         Return a list of swarm's nodes.
 
@@ -31,7 +31,7 @@ async def list(self, *, filters: Dict=None) -> List[Dict]:
 
         return response
 
-    async def inspect(self, *, node_id: str) -> Dict[str, Any]:
+    async def inspect(self, *, node_id: str) -> Mapping[str, Any]:
         """
         Inspect a node
 
@@ -46,8 +46,8 @@ async def inspect(self, *, node_id: str) -> Dict[str, Any]:
         return response
 
     async def update(
-        self, *, node_id: str, version: int, spec: Dict[str, Any]
-    ) -> Dict[str, Any]:
+        self, *, node_id: str, version: int, spec: Mapping[str, Any]
+    ) -> Mapping[str, Any]:
         """
         Update the spec of a node.
 
@@ -78,7 +78,7 @@ async def remove(
         *,
         node_id: str,
         force: bool=False
-    ) -> Dict[str, Any]:
+    ) -> Mapping[str, Any]:
         """
         Remove a node from a swarm.
 

aiodocker/services.py

@@ -1,5 +1,5 @@
 import json
-from typing import Optional, Dict, List, Any, Union, AsyncIterator
+from typing import Mapping, List, Any, Union, AsyncIterator
 from .multiplexed import multiplexed_result
 from .utils import clean_map, clean_networks, clean_filters, format_env
 
@@ -8,7 +8,7 @@ class DockerServices(object):
     def __init__(self, docker):
         self.docker = docker
 
-    async def list(self, *, filters: Optional[Dict]=None) -> List[Dict]:
+    async def list(self, *, filters: Mapping=None) -> List[Mapping]:
         """
         Return a list of services
 
@@ -32,16 +32,16 @@ async def list(self, *, filters: Optional[Dict]=None) -> List[Dict]:
         return response
 
     async def create(self,
-                     task_template: Dict[str, Any],
+                     task_template: Mapping[str, Any],
                      *,
-                     name: Optional[str]=None,
-                     labels: Optional[List]=None,
-                     mode: Optional[Dict]=None,
-                     update_config: Optional[Dict]=None,
-                     rollback_config: Optional[Dict]=None,
-                     networks: Optional[List]=None,
-                     endpoint_spec: Optional[Dict]=None
-                     ) -> Dict[str, Any]:
+                     name: str=None,
+                     labels: List=None,
+                     mode: Mapping=None,
+                     update_config: Mapping=None,
+                     rollback_config: Mapping=None,
+                     networks: List=None,
+                     endpoint_spec: Mapping=None
+                     ) -> Mapping[str, Any]:
         """
         Create a service
 
@@ -152,7 +152,7 @@ async def delete(self, service_id: str) -> bool:
         )
         return True
 
-    async def inspect(self, service_id: str) -> Dict[str, Any]:
+    async def inspect(self, service_id: str) -> Mapping[str, Any]:
         """
         Inspect a service
 

aiodocker/tasks.py

@@ -1,12 +1,12 @@
-from typing import Optional, List, Any, Dict
+from typing import List, Any, Mapping
 from .utils import clean_filters
 
 
 class DockerTasks(object):
     def __init__(self, docker):
         self.docker = docker
 
-    async def list(self, *, filters: Optional[Dict]=None) -> List[Dict]:
+    async def list(self, *, filters: Mapping=None) -> List[Mapping]:
         """
         Return a list of tasks
 
@@ -32,7 +32,7 @@ async def list(self, *, filters: Optional[Dict]=None) -> List[Dict]:
         )
         return response
 
-    async def inspect(self, task_id: str) -> Dict[str, Any]:
+    async def inspect(self, task_id: str) -> Mapping[str, Any]:
         """
         Return info about a task
 

aiodocker/utils.py

@@ -184,7 +184,7 @@ def format_env(key, value: Union[None, bytes, str]) -> str:
     return "{key}={value}".format(key=key, value=value)
 
 
-def clean_networks(networks: Optional[Iterable[str]]=None) -> Iterable[str]:
+def clean_networks(networks: Iterable[str]=None) -> Iterable[str]:
     """
     Cleans the values inside `networks`
     Returns a new list
@@ -202,7 +202,7 @@ def clean_networks(networks: Optional[Iterable[str]]=None) -> Iterable[str]:
     return result
 
 
-def clean_filters(filters: Optional[dict]=None) -> str:
+def clean_filters(filters: Mapping=None) -> str:
     """
     Checks the values inside `filters`
     https://docs.docker.com/engine/api/v1.29/#operation/ServiceList
@@ -245,7 +245,7 @@ def mktar_from_dockerfile(fileobject: BinaryIO) -> IO:
 
 
 def compose_auth_header(auth: Union[MutableMapping, str, bytes],
-                        registry_addr: Optional[str]=None) -> str:
+                        registry_addr: str=None) -> str:
     """
     Validate and compose base64-encoded authentication header
     with an optional support for parsing legacy-style "user:password"