Merge branch 'containers:main' into detach_fix

podman/api/client.py

@@ -102,7 +102,7 @@ def __init__(
         use_ssh_client=True,
         max_pool_size=None,
         **kwargs,
-    ):  # pylint: disable=unused-argument
+    ):  # pylint: disable=unused-argument,too-many-positional-arguments
         """Instantiate APIClient object.
 
         Args:
@@ -199,6 +199,7 @@ def _normalize_url(base_url: str) -> urllib.parse.ParseResult:
     def delete(
         self,
         path: Union[str, bytes],
+        *,
         params: Union[None, bytes, Mapping[str, str]] = None,
         headers: Optional[Mapping[str, str]] = None,
         timeout: _Timeout = None,
@@ -233,6 +234,7 @@ def delete(
     def get(
         self,
         path: Union[str, bytes],
+        *,
         params: Union[None, bytes, Mapping[str, List[str]]] = None,
         headers: Optional[Mapping[str, str]] = None,
         timeout: _Timeout = None,
@@ -267,6 +269,7 @@ def get(
     def head(
         self,
         path: Union[str, bytes],
+        *,
         params: Union[None, bytes, Mapping[str, str]] = None,
         headers: Optional[Mapping[str, str]] = None,
         timeout: _Timeout = None,
@@ -301,6 +304,7 @@ def head(
     def post(
         self,
         path: Union[str, bytes],
+        *,
         params: Union[None, bytes, Mapping[str, str]] = None,
         data: _Data = None,
         headers: Optional[Mapping[str, str]] = None,
@@ -339,6 +343,7 @@ def post(
     def put(
         self,
         path: Union[str, bytes],
+        *,
         params: Union[None, bytes, Mapping[str, str]] = None,
         data: _Data = None,
         headers: Optional[Mapping[str, str]] = None,
@@ -377,6 +382,7 @@ def _request(
         self,
         method: str,
         path: Union[str, bytes],
+        *,
         data: _Data = None,
         params: Union[None, bytes, Mapping[str, str]] = None,
         headers: Optional[Mapping[str, str]] = None,

podman/api/ssh.py

@@ -250,7 +250,7 @@ def __init__(
         max_retries: int = DEFAULT_RETRIES,
         pool_block: int = DEFAULT_POOLBLOCK,
         **kwargs,
-    ):
+    ):  # pylint: disable=too-many-positional-arguments
         """Initialize SSHAdapter.
 
         Args:

podman/api/uds.py

@@ -137,7 +137,7 @@ def __init__(
         max_retries=DEFAULT_RETRIES,
         pool_block=DEFAULT_POOLBLOCK,
         **kwargs,
-    ):
+    ):  # pylint: disable=too-many-positional-arguments
         """Initialize UDSAdapter.
 
         Args:

podman/client.py

@@ -82,6 +82,7 @@ def __exit__(self, exc_type, exc_value, traceback) -> None:
     @classmethod
     def from_env(
         cls,
+        *,
         version: str = "auto",
         timeout: Optional[int] = None,
         max_pool_size: Optional[int] = None,

podman/domain/containers.py

@@ -126,19 +126,20 @@ def diff(self) -> List[Dict[str, int]]:
         response.raise_for_status()
         return response.json()
 
-    # pylint: disable=too-many-arguments,unused-argument
+    # pylint: disable=too-many-arguments
     def exec_run(
         self,
         cmd: Union[str, List[str]],
+        *,
         stdout: bool = True,
         stderr: bool = True,
         stdin: bool = False,
         tty: bool = False,
         privileged: bool = False,
         user=None,
         detach: bool = False,
-        stream: bool = False,
-        socket: bool = False,
+        stream: bool = False,  # pylint: disable=unused-argument
+        socket: bool = False,  # pylint: disable=unused-argument
         environment: Union[Mapping[str, str], List[str]] = None,
         workdir: str = None,
         demux: bool = False,

podman/domain/containers_run.py

@@ -19,6 +19,7 @@ def run(
         self,
         image: Union[str, Image],
         command: Union[str, List[str], None] = None,
+        *,
         stdout=True,
         stderr=False,
         remove: bool = False,

podman/domain/ipam.py

@@ -40,7 +40,7 @@ class IPAMConfig(dict):
 
     def __init__(
         self,
-        driver: Optional[str] = "default",
+        driver: Optional[str] = "host-local",
         pool_configs: Optional[List[IPAMPool]] = None,
         options: Optional[Mapping[str, Any]] = None,
     ):

podman/domain/networks_manager.py

@@ -76,6 +76,9 @@ def create(self, name: str, **kwargs) -> Network:
         return self.prepare_model(attrs=response.json())
 
     def _prepare_ipam(self, data: Dict[str, Any], ipam: Dict[str, Any]):
+        if "Driver" in ipam:
+            data["ipam_options"] = {"driver": ipam["Driver"]}
+
         if "Config" not in ipam:
             return
 

podman/domain/system.py

@@ -36,7 +36,7 @@ def info(self, *_, **__) -> Dict[str, Any]:
         response.raise_for_status()
         return response.json()
 
-    def login(
+    def login(  # pylint: disable=too-many-arguments,too-many-positional-arguments,unused-argument
         self,
         username: str,
         password: Optional[str] = None,

podman/errors/exceptions.py

@@ -115,7 +115,7 @@ def __init__(
         command: Union[str, List[str]],
         image: str,
         stderr: Optional[Iterable[str]] = None,
-    ):
+    ):  # pylint: disable=too-many-positional-arguments
         """Initialize ContainerError.
 
         Args: