From aaf69f3bd02d699f5a9a30d14929b609d7a05e27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 05:25:28 +0000 Subject: [PATCH 1/5] Bump types-docker from 7.1.0.20240626 to 7.1.0.20240628 Bumps [types-docker](https://github.com/python/typeshed) from 7.1.0.20240626 to 7.1.0.20240628. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 34c5d35b4..23462942e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -85,7 +85,7 @@ optional-dependencies.dev = [ "sphinxcontrib-spelling==8", "sybil==6.1.1", "tenacity==8.4.2", - "types-docker==7.1.0.20240626", + "types-docker==7.1.0.20240628", "types-pillow==10.2.0.20240520", "types-pyyaml==6.0.12.20240311", "types-requests==2.32.0.20240622", From 1039cc2ce627fba16d601ebdf81e98619b3abacd Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Fri, 28 Jun 2024 12:09:01 +0100 Subject: [PATCH 2/5] Workaround for types-docker bug --- tests/mock_vws/test_docker.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/mock_vws/test_docker.py b/tests/mock_vws/test_docker.py index 616c6aa8a..07ab8cfaf 100644 --- a/tests/mock_vws/test_docker.py +++ b/tests/mock_vws/test_docker.py @@ -163,6 +163,7 @@ def test_build_and_run( name=target_manager_container_name, publish_all_ports=True, network=custom_bridge_network.name, + version=target_manager_tag, ) vws_container = client.containers.run( # pyright: ignore[reportUnknownMemberType] image=vws_image, @@ -173,6 +174,7 @@ def test_build_and_run( environment={ "TARGET_MANAGER_BASE_URL": target_manager_internal_base_url, }, + version=vws_tag, ) vwq_container = client.containers.run( # pyright: ignore[reportUnknownMemberType] image=vwq_image, @@ -183,6 +185,7 @@ def test_build_and_run( environment={ "TARGET_MANAGER_BASE_URL": target_manager_internal_base_url, }, + version=vwq_tag, ) for container in (target_manager_container, vws_container, vwq_container): From bdf2e31637d112fd0be09353e6276600e0b632c3 Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Fri, 28 Jun 2024 12:09:06 +0100 Subject: [PATCH 3/5] Remove pyright ignore --- tests/mock_vws/test_docker.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/mock_vws/test_docker.py b/tests/mock_vws/test_docker.py index 07ab8cfaf..8198847e1 100644 --- a/tests/mock_vws/test_docker.py +++ b/tests/mock_vws/test_docker.py @@ -157,7 +157,7 @@ def test_build_and_run( f"http://{target_manager_container_name}:5000" ) - target_manager_container = client.containers.run( # pyright: ignore[reportUnknownMemberType] + target_manager_container = client.containers.run( image=target_manager_image, detach=True, name=target_manager_container_name, @@ -165,7 +165,7 @@ def test_build_and_run( network=custom_bridge_network.name, version=target_manager_tag, ) - vws_container = client.containers.run( # pyright: ignore[reportUnknownMemberType] + vws_container = client.containers.run( image=vws_image, detach=True, name="vws-mock-vws-" + random, @@ -176,7 +176,7 @@ def test_build_and_run( }, version=vws_tag, ) - vwq_container = client.containers.run( # pyright: ignore[reportUnknownMemberType] + vwq_container = client.containers.run( image=vwq_image, detach=True, name="vws-mock-vwq-" + random, From 3ff2982f91ae6ad0751e6727644c2f57ba870ead Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Fri, 28 Jun 2024 12:11:07 +0100 Subject: [PATCH 4/5] Fix tag --- tests/mock_vws/test_docker.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/mock_vws/test_docker.py b/tests/mock_vws/test_docker.py index 8198847e1..7374bb59c 100644 --- a/tests/mock_vws/test_docker.py +++ b/tests/mock_vws/test_docker.py @@ -163,7 +163,7 @@ def test_build_and_run( name=target_manager_container_name, publish_all_ports=True, network=custom_bridge_network.name, - version=target_manager_tag, + version=target_manager_image.tags[0], ) vws_container = client.containers.run( image=vws_image, @@ -174,7 +174,7 @@ def test_build_and_run( environment={ "TARGET_MANAGER_BASE_URL": target_manager_internal_base_url, }, - version=vws_tag, + version=vws_image.tags[0], ) vwq_container = client.containers.run( image=vwq_image, @@ -185,7 +185,7 @@ def test_build_and_run( environment={ "TARGET_MANAGER_BASE_URL": target_manager_internal_base_url, }, - version=vwq_tag, + version=vwq_image.tags[0], ) for container in (target_manager_container, vws_container, vwq_container): From dd9061bc45e2384cccc3854749f4929951e2683b Mon Sep 17 00:00:00 2001 From: Adam Dangoor Date: Fri, 28 Jun 2024 12:15:29 +0100 Subject: [PATCH 5/5] Use API version as "auto" --- tests/mock_vws/test_docker.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/mock_vws/test_docker.py b/tests/mock_vws/test_docker.py index 7374bb59c..2560beef6 100644 --- a/tests/mock_vws/test_docker.py +++ b/tests/mock_vws/test_docker.py @@ -163,7 +163,7 @@ def test_build_and_run( name=target_manager_container_name, publish_all_ports=True, network=custom_bridge_network.name, - version=target_manager_image.tags[0], + version="auto", ) vws_container = client.containers.run( image=vws_image, @@ -174,7 +174,7 @@ def test_build_and_run( environment={ "TARGET_MANAGER_BASE_URL": target_manager_internal_base_url, }, - version=vws_image.tags[0], + version="auto", ) vwq_container = client.containers.run( image=vwq_image, @@ -185,7 +185,7 @@ def test_build_and_run( environment={ "TARGET_MANAGER_BASE_URL": target_manager_internal_base_url, }, - version=vwq_image.tags[0], + version="auto", ) for container in (target_manager_container, vws_container, vwq_container):