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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pytest-docker
-Version: 3.2.0
+Version: 3.2.2
 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.2.0 → pytest_docker-3.2.2}/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.2.0 → pytest_docker-3.2.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pytest-docker
-version = 3.2.0
+version = 3.2.2
 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.2.0 → pytest_docker-3.2.2}/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.2.0 → pytest_docker-3.2.2}/src/pytest_docker/plugin.py

@@ -46,10 +46,8 @@ def get_docker_ip() -> Union[str, Any]:
     if not docker_host or docker_host.startswith("unix://"):
         return "127.0.0.1"
 
-    match = re.match(r"^tcp://(.+?):\d+$", docker_host)
-    if not match:
-        raise ValueError('Invalid value for DOCKER_HOST: "%s".' % (docker_host,))
-    return match.group(1)
+    # Return just plain address without prefix and port
+    return re.sub(r"^[^:]+://(.+):\d+$", r"\1", docker_host)
 
 
 @pytest.fixture(scope=containers_scope)

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pytest-docker
-Version: 3.2.0
+Version: 3.2.2
 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.2.0 → pytest_docker-3.2.2}/tests/test_docker_ip.py

@@ -23,10 +23,8 @@ def test_docker_ip_unix() -> None:
         assert get_docker_ip() == "127.0.0.1"
 
 
-@pytest.mark.parametrize("docker_host", ["http://1.2.3.4:2376"])
+@pytest.mark.parametrize("docker_host", ["http://1.2.3.4:2376", "tcp://1.2.3.4:2376"])
 def test_docker_ip_remote_invalid(docker_host: str) -> None:
     environ = {"DOCKER_HOST": docker_host}
     with mock.patch("os.environ", environ):
-        with pytest.raises(ValueError) as exc:
-            print(get_docker_ip())
-        assert str(exc.value) == ('Invalid value for DOCKER_HOST: "%s".' % (docker_host,))
+        assert get_docker_ip() == "1.2.3.4"