Bump isort from 4.3.21 to 5.6.4 (#520)

* Bump isort from 4.3.21 to 5.6.4

Bumps [isort](https://github.com/pycqa/isort) from 4.3.21 to 5.6.4.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/develop/CHANGELOG.md)
- [Commits](PyCQA/isort@4.3.21...5.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Reformat

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>

Makefile

@@ -4,14 +4,12 @@ lint flake: .flake
 
 .flake:
 	flake8 aiodocker tests
-	if python -c "import sys; sys.exit(sys.version_info<(3,6))"; then \
-		black --check aiodocker tests setup.py; \
-	        isort --check -rc aiodocker tests setup.py; \
-	fi
+	black --check aiodocker tests setup.py
+	isort --check aiodocker tests setup.py
 	mypy aiodocker tests
 
 fmt:
-	isort -rc aiodocker tests setup.py
+	isort aiodocker tests setup.py
 	black aiodocker tests setup.py
 
 develop:

aiodocker/execs.py

@@ -50,13 +50,19 @@ async def resize(self, *, h: Optional[int] = None, w: Optional[int] = None) -> N
 
     @overload
     def start(
-        self, *, timeout: aiohttp.ClientTimeout = None, detach: Literal[False] = False,
+        self,
+        *,
+        timeout: aiohttp.ClientTimeout = None,
+        detach: Literal[False] = False,
     ) -> Stream:
         pass
 
     @overload  # noqa
     async def start(
-        self, *, timeout: aiohttp.ClientTimeout = None, detach: Literal[True],
+        self,
+        *,
+        timeout: aiohttp.ClientTimeout = None,
+        detach: Literal[True],
     ) -> bytes:
         pass
 
@@ -95,7 +101,9 @@ async def setup() -> Tuple[URL, bytes, bool]:
             return Stream(self.docker, setup, timeout)
 
     async def _start_detached(
-        self, timeout: aiohttp.ClientTimeout = None, tty: bool = False,
+        self,
+        timeout: aiohttp.ClientTimeout = None,
+        tty: bool = False,
     ) -> bytes:
         if self._tty is None:
             await self.inspect()  # should restore tty

aiodocker/images.py

@@ -348,7 +348,11 @@ def build(  # noqa: F811
             params.update({"labels": json.dumps(labels)})
 
         cm = self.docker._query(
-            "build", "POST", params=clean_map(params), headers=headers, data=data,
+            "build",
+            "POST",
+            params=clean_map(params),
+            headers=headers,
+            data=data,
         )
         return self._handle_response(cm, stream)
 

aiodocker/logs.py

@@ -8,8 +8,8 @@
 
 
 if TYPE_CHECKING:
-    from .docker import Docker
     from .containers import DockerContainer
+    from .docker import Docker
 
 
 class DockerLog:

aiodocker/stream.py

@@ -69,7 +69,8 @@ async def _init(self) -> None:
                 else:
                     msg = msg + f" Body: [{body!r}]"
             raise DockerError(
-                500, {"message": msg},
+                500,
+                {"message": msg},
             )
         protocol = conn.protocol
         loop = resp._loop

requirements/test.txt

@@ -5,5 +5,5 @@ pytest-asyncio==0.14.0
 flake8==3.8.4
 mypy==0.790
 black==20.8b1
-isort==4.3.21
+isort==5.6.4
 -r ci.txt

tests/test_execs.py

@@ -37,7 +37,11 @@ async def test_exec_attached(shell_container, stderr):
         cmd = ["python", "-c", "print('Hello')"]
 
     execute = await shell_container.exec(
-        stdout=True, stderr=True, stdin=True, tty=False, cmd=cmd,
+        stdout=True,
+        stderr=True,
+        stdin=True,
+        tty=False,
+        cmd=cmd,
     )
     async with execute.start(detach=False) as stream:
         msg = await stream.read_out()
@@ -52,7 +56,11 @@ async def test_exec_attached(shell_container, stderr):
 )
 async def test_exec_attached_tty(shell_container):
     execute = await shell_container.exec(
-        stdout=True, stderr=True, stdin=True, tty=True, cmd=["python", "-q"],
+        stdout=True,
+        stderr=True,
+        stdin=True,
+        tty=True,
+        cmd=["python", "-q"],
     )
     async with execute.start(detach=False) as stream:
         await execute.resize(w=80, h=25)
@@ -84,15 +92,23 @@ async def test_exec_detached(shell_container, tty, stderr):
         cmd = ["python", "-c", "print('Hello')"]
 
     execute = await shell_container.exec(
-        stdout=True, stderr=True, stdin=False, tty=tty, cmd=cmd,
+        stdout=True,
+        stderr=True,
+        stdin=False,
+        tty=tty,
+        cmd=cmd,
     )
     assert await execute.start(detach=True) == b""
 
 
 @pytest.mark.asyncio
 async def test_exec_resize(shell_container):
     execute = await shell_container.exec(
-        stdout=True, stderr=True, stdin=True, tty=True, cmd=["python"],
+        stdout=True,
+        stderr=True,
+        stdin=True,
+        tty=True,
+        cmd=["python"],
     )
     await execute.start(detach=True)
     await execute.resize(w=120, h=10)
@@ -127,7 +143,11 @@ async def test_exec_inspect(shell_container):
 @pytest.mark.asyncio
 async def test_exec_restore_tty_attached(docker, shell_container):
     exec1 = await shell_container.exec(
-        stdout=True, stderr=True, stdin=True, tty=True, cmd=["python"],
+        stdout=True,
+        stderr=True,
+        stdin=True,
+        tty=True,
+        cmd=["python"],
     )
 
     exec2 = docker.containers.exec(exec1.id)
@@ -139,7 +159,11 @@ async def test_exec_restore_tty_attached(docker, shell_container):
 @pytest.mark.asyncio
 async def test_exec_restore_tty_detached(docker, shell_container):
     exec1 = await shell_container.exec(
-        stdout=True, stderr=True, stdin=True, tty=True, cmd=["python"],
+        stdout=True,
+        stderr=True,
+        stdin=True,
+        tty=True,
+        cmd=["python"],
     )
 
     exec2 = docker.containers.exec(exec1.id)

tests/test_integration.py

@@ -409,12 +409,16 @@ async def test_events(docker, image_name, event_loop):
             break
 
     # 'kill' event may be omitted
-    assert events_occurred == [
-        "create",
-        "start",
-        "kill",
-        "die",
-        "destroy",
-    ] or events_occurred == ["create", "start", "die", "destroy"]
+    assert (
+        events_occurred
+        == [
+            "create",
+            "start",
+            "kill",
+            "die",
+            "destroy",
+        ]
+        or events_occurred == ["create", "start", "die", "destroy"]
+    )
 
     await docker.events.stop()