Skip to content

Commit

Permalink
allow docker_compose_files to be a list
Browse files Browse the repository at this point in the history
This is already supported in the code, just fixing a regression in the type annotations from #101
  • Loading branch information
hsheth2 authored and augi committed Feb 2, 2024
1 parent 3066c53 commit 697d3d8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/pytest_docker/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""

Expand Down Expand Up @@ -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],
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 697d3d8

Please sign in to comment.