Skip to content

Commit 806f2a9

Browse files
committed
linting fixes
Signed-off-by: Paul S. Schweigert <[email protected]>
1 parent 852c3a3 commit 806f2a9

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

compose/testcontainers/compose/__init__.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ def __exit__(self, exc_type, exc_val, exc_tb) -> None:
7474
@cached_property
7575
def base_docker_compose(self):
7676
"""
77-
Returns the basecommand parts used for the docker compose commands depending on the docker compose api
77+
Returns the basecommand parts used for the docker compose commands
78+
depending on the docker compose api.
7879
7980
Returns
8081
-------
@@ -84,8 +85,11 @@ def base_docker_compose(self):
8485
if self._user_defined_compose_command:
8586
return self._user_defined_compose_command
8687

87-
return ["docker","compose"] if subprocess.run(["docker", "compose", "--help"], stdout=subprocess.DEVNULL,
88-
stderr=subprocess.STDOUT).returncode == 0 else ["docker-compose"]
88+
if subprocess.run(["docker", "compose", "--help"], stdout=subprocess.DEVNULL,
89+
stderr=subprocess.STDOUT).returncode == 0:
90+
return ["docker", "compose"]
91+
92+
return ["docker-compose"]
8993

9094
def docker_compose_command(self) -> List[str]:
9195
"""

compose/tests/test_docker_compose.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ def test_can_build_images_before_spawning_service_via_compose():
3434

3535
assert compose.build
3636
docker_compose_cmd = call_mock.call_args_list[0][1]["cmd"]
37-
assert "docker-compose" in docker_compose_cmd or ("docker" in docker_compose_cmd and "compose" in docker_compose_cmd)
37+
assert "docker-compose" in docker_compose_cmd or ("docker" in docker_compose_cmd
38+
and "compose" in docker_compose_cmd)
3839
assert "up" in docker_compose_cmd
3940
assert "--build" in docker_compose_cmd
4041

0 commit comments

Comments
 (0)