Skip to content

Commit 17877c3

Browse files
committed
chore(deps): pytest 9.x allowed
1 parent 65acfe2 commit 17877c3

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

setup.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = pytest-docker
3-
version = 3.2.3
3+
version = 3.2.4
44
description = Simple pytest fixtures for Docker and Docker Compose based tests
55
long_description = file: README.md
66
long_description_content_type = text/markdown
@@ -35,7 +35,7 @@ package_dir=
3535
packages=pytest_docker
3636

3737
install_requires =
38-
pytest >=4.0, <9.0
38+
pytest >=4.0, <10.0
3939
attrs >=19.2.0
4040

4141
[options.extras_require]
@@ -85,3 +85,4 @@ strict = true
8585
mypy_path = "src/pytest_docker,tests"
8686
namespace_packages = true
8787
warn_unused_ignores = true
88+
warn_return_any = false

src/pytest_docker/plugin.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import contextlib
22
import os
3+
from pathlib import Path
34
import re
45
import subprocess
56
import time
@@ -119,7 +120,7 @@ def wait_until_responsive(
119120
raise Exception("Timeout reached while waiting on service!")
120121

121122

122-
def str_to_list(arg: Union[str, List[Any], Tuple[Any]]) -> Union[List[Any], Tuple[Any]]:
123+
def str_to_list(arg: Union[str, Path, List[Any], Tuple[Any]]) -> Union[List[Any], Tuple[Any]]:
123124
if isinstance(arg, (list, tuple)):
124125
return arg
125126
return [arg]

tests/test_dockercomposeexecutor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import subprocess
22
from unittest import mock
33

4-
import py
4+
from pathlib import Path
55
from pytest_docker.plugin import DockerComposeExecutor
66

77

@@ -32,8 +32,8 @@ def test_execute_docker_compose_v2() -> None:
3232

3333

3434
def test_pypath_compose_files() -> None:
35-
compose_file: py.path.local = py.path.local("/tmp/docker-compose.yml")
36-
docker_compose = DockerComposeExecutor("docker compose", compose_file, "pytest123") # type: ignore
35+
compose_file: Path = Path("/tmp/docker-compose.yml")
36+
docker_compose = DockerComposeExecutor("docker compose", compose_file, "pytest123")
3737
with mock.patch("subprocess.check_output") as check_output:
3838
docker_compose.execute("up")
3939
assert check_output.call_args_list == [

0 commit comments

Comments
 (0)