From 697d3d86f182f13e3276506f554a382172899d7c Mon Sep 17 00:00:00 2001 From: Harshal Sheth Date: Thu, 1 Feb 2024 15:26:54 -0800 Subject: [PATCH] allow docker_compose_files to be a list This is already supported in the code, just fixing a regression in the type annotations from https://github.com/avast/pytest-docker/pull/101 --- src/pytest_docker/plugin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pytest_docker/plugin.py b/src/pytest_docker/plugin.py index 3d0afb4..bcb7a31 100644 --- a/src/pytest_docker/plugin.py +++ b/src/pytest_docker/plugin.py @@ -150,7 +150,7 @@ def docker_compose_command() -> str: @pytest.fixture(scope=containers_scope) -def docker_compose_file(pytestconfig: Any) -> str: +def docker_compose_file(pytestconfig: Any) -> Union[List[str], str]: """Get an absolute path to the `docker-compose.yml` file. Override this fixture in your tests if you need a custom location.""" @@ -194,7 +194,7 @@ def docker_setup() -> Union[List[str], str]: @contextlib.contextmanager def get_docker_services( docker_compose_command: str, - docker_compose_file: str, + docker_compose_file: Union[List[str], str], docker_compose_project_name: str, docker_setup: Union[List[str], str], docker_cleanup: Union[List[str], str], @@ -227,7 +227,7 @@ def get_docker_services( @pytest.fixture(scope=containers_scope) def docker_services( docker_compose_command: str, - docker_compose_file: str, + docker_compose_file: Union[List[str], str], docker_compose_project_name: str, docker_setup: str, docker_cleanup: str,