pytest-docker 3.1.2__tar.gz → 3.2.1__tar.gz

{pytest_docker-3.1.2/src/pytest_docker.egg-info → pytest_docker-3.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pytest-docker
-Version: 3.1.2
+Version: 3.2.1
 Summary: Simple pytest fixtures for Docker and Docker Compose based tests
 Home-page: https://github.com/avast/pytest-docker
 Author: Max K., Andre Caron
@@ -35,6 +35,7 @@ Requires-Dist: pytest-pycodestyle<3.0,>=2.0.0; extra == "tests"
 Requires-Dist: pytest-mypy<1.0,>=0.10; extra == "tests"
 Requires-Dist: types-requests<3.0,>=2.31; extra == "tests"
 Requires-Dist: types-setuptools<70.0,>=69.0; extra == "tests"
+Dynamic: license-file
 
 Docker-based integration tests
 =====
@@ -175,7 +176,7 @@ def docker_compose_project_name() -> str:
 
 # Stop the stack before starting a new one
 @pytest.fixture(scope="session")
-def docker_setup_command():
+def docker_setup():
     return ["down -v", "up --build -d"]
 ```
 

{pytest_docker-3.1.2 → pytest_docker-3.2.1}/README.md

@@ -137,7 +137,7 @@ def docker_compose_project_name() -> str:
 
 # Stop the stack before starting a new one
 @pytest.fixture(scope="session")
-def docker_setup_command():
+def docker_setup():
     return ["down -v", "up --build -d"]
 ```
 

{pytest_docker-3.1.2 → pytest_docker-3.2.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pytest-docker
-version = 3.1.2
+version = 3.2.1
 description = Simple pytest fixtures for Docker and Docker Compose based tests
 long_description = file: README.md
 long_description_content_type = text/markdown

{pytest_docker-3.1.2 → pytest_docker-3.2.1}/src/pytest_docker/__init__.py

@@ -8,6 +8,7 @@ from .plugin import (
     docker_ip,
     docker_services,
     docker_setup,
+    Services,
 )
 
 __all__ = [
@@ -18,6 +19,7 @@ __all__ = [
     "docker_setup",
     "docker_cleanup",
     "docker_services",
+    "Services",
 ]
 
 

{pytest_docker-3.1.2 → pytest_docker-3.2.1}/src/pytest_docker/plugin.py

@@ -21,10 +21,11 @@ def containers_scope(fixture_name: str, config: Config) -> Any:  # pylint: disab
     return config.getoption("--container-scope", "session")
 
 
-def execute(command: str, success_codes: Iterable[int] = (0,)) -> Union[bytes, Any]:
+def execute(command: str, success_codes: Iterable[int] = (0,), ignore_stderr: bool = False) -> Union[bytes, Any]:
     """Run a shell command."""
     try:
-        output = subprocess.check_output(command, stderr=subprocess.STDOUT, shell=True)
+        stderr_pipe = subprocess.DEVNULL if ignore_stderr else subprocess.STDOUT
+        output = subprocess.check_output(command, stderr=stderr_pipe, shell=True)
         status = 0
     except subprocess.CalledProcessError as error:
         output = error.output or b""
@@ -132,12 +133,12 @@ class DockerComposeExecutor:
     _compose_files: Any = attr.ib(converter=str_to_list)
     _compose_project_name: str = attr.ib()
 
-    def execute(self, subcommand: str) -> Union[bytes, Any]:
+    def execute(self, subcommand: str, **kwargs: Any) -> Union[bytes, Any]:
         command = self._compose_command
         for compose_file in self._compose_files:
             command += ' -f "{}"'.format(compose_file)
         command += ' -p "{}" {}'.format(self._compose_project_name, subcommand)
-        return execute(command)
+        return execute(command, **kwargs)
 
 
 @pytest.fixture(scope=containers_scope)

{pytest_docker-3.1.2 → pytest_docker-3.2.1/src/pytest_docker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pytest-docker
-Version: 3.1.2
+Version: 3.2.1
 Summary: Simple pytest fixtures for Docker and Docker Compose based tests
 Home-page: https://github.com/avast/pytest-docker
 Author: Max K., Andre Caron
@@ -35,6 +35,7 @@ Requires-Dist: pytest-pycodestyle<3.0,>=2.0.0; extra == "tests"
 Requires-Dist: pytest-mypy<1.0,>=0.10; extra == "tests"
 Requires-Dist: types-requests<3.0,>=2.31; extra == "tests"
 Requires-Dist: types-setuptools<70.0,>=69.0; extra == "tests"
+Dynamic: license-file
 
 Docker-based integration tests
 =====
@@ -175,7 +176,7 @@ def docker_compose_project_name() -> str:
 
 # Stop the stack before starting a new one
 @pytest.fixture(scope="session")
-def docker_setup_command():
+def docker_setup():
     return ["down -v", "up --build -d"]
 ```