pytest-docker 3.2.2__tar.gz → 3.2.4__tar.gz

{pytest_docker-3.2.2/src/pytest_docker.egg-info → pytest_docker-3.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-docker
-Version: 3.2.2
+Version: 3.2.4
 Summary: Simple pytest fixtures for Docker and Docker Compose based tests
 Home-page: https://github.com/avast/pytest-docker
 Author: Max K., Andre Caron
@@ -23,7 +23,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pytest<9.0,>=4.0
+Requires-Dist: pytest<10.0,>=4.0
 Requires-Dist: attrs>=19.2.0
 Provides-Extra: docker-compose-v1
 Requires-Dist: docker-compose<2.0,>=1.27.3; extra == "docker-compose-v1"

{pytest_docker-3.2.2 → pytest_docker-3.2.4}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pytest-docker
-version = 3.2.2
+version = 3.2.4
 description = Simple pytest fixtures for Docker and Docker Compose based tests
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -30,7 +30,7 @@ package_dir =
 	=src
 packages = pytest_docker
 install_requires = 
-	pytest >=4.0, <9.0
+	pytest >=4.0, <10.0
 	attrs >=19.2.0
 
 [options.extras_require]
@@ -79,6 +79,7 @@ strict = true
 mypy_path = "src/pytest_docker,tests"
 namespace_packages = true
 warn_unused_ignores = true
+warn_return_any = false
 
 [egg_info]
 tag_build = 

{pytest_docker-3.2.2 → pytest_docker-3.2.4}/src/pytest_docker/plugin.py

@@ -1,10 +1,11 @@
 import contextlib
 import os
+from pathlib import Path
 import re
 import subprocess
 import time
 import timeit
-from typing import Any, Dict, Iterable, Iterator, List, Tuple, Union
+from typing import Any, Dict, Iterable, Iterator, List, Optional, Tuple, Union
 
 import attr
 import pytest
@@ -78,7 +79,7 @@ class Services:
         """
 
         # Lookup in the cache.
-        cache: int = self._services.get(service, {}).get(container_port, None)
+        cache: Optional[int] = self._services.get(service, {}).get(container_port, None)
         if cache is not None:
             return cache
 
@@ -119,7 +120,7 @@ class Services:
         raise Exception("Timeout reached while waiting on service!")
 
 
-def str_to_list(arg: Union[str, List[Any], Tuple[Any]]) -> Union[List[Any], Tuple[Any]]:
+def str_to_list(arg: Union[str, Path, List[Any], Tuple[Any]]) -> Union[List[Any], Tuple[Any]]:
     if isinstance(arg, (list, tuple)):
         return arg
     return [arg]

{pytest_docker-3.2.2 → pytest_docker-3.2.4/src/pytest_docker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-docker
-Version: 3.2.2
+Version: 3.2.4
 Summary: Simple pytest fixtures for Docker and Docker Compose based tests
 Home-page: https://github.com/avast/pytest-docker
 Author: Max K., Andre Caron
@@ -23,7 +23,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pytest<9.0,>=4.0
+Requires-Dist: pytest<10.0,>=4.0
 Requires-Dist: attrs>=19.2.0
 Provides-Extra: docker-compose-v1
 Requires-Dist: docker-compose<2.0,>=1.27.3; extra == "docker-compose-v1"

{pytest_docker-3.2.2 → pytest_docker-3.2.4}/src/pytest_docker.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pytest<9.0,>=4.0
+pytest<10.0,>=4.0
 attrs>=19.2.0
 
 [docker-compose-v1]

{pytest_docker-3.2.2 → pytest_docker-3.2.4}/tests/test_dockercomposeexecutor.py

@@ -1,7 +1,7 @@
 import subprocess
 from unittest import mock
 
-import py
+from pathlib import Path
 from pytest_docker.plugin import DockerComposeExecutor
 
 
@@ -31,9 +31,9 @@ def test_execute_docker_compose_v2() -> None:
         ]
 
 
-def test_pypath_compose_files() -> None:
-    compose_file: py.path.local = py.path.local("/tmp/docker-compose.yml")
-    docker_compose = DockerComposeExecutor("docker compose", compose_file, "pytest123")  # type: ignore
+def test_path_compose_file() -> None:
+    compose_file: Path = Path("/tmp/docker-compose.yml")
+    docker_compose = DockerComposeExecutor("docker compose", compose_file, "pytest123")
     with mock.patch("subprocess.check_output") as check_output:
         docker_compose.execute("up")
         assert check_output.call_args_list == [