From 964cef629929c70505e8e21d65a235e23ddf8a3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 05:18:18 +0000
Subject: [PATCH 1/3] Bump types-docker from 7.0.0.20240513 to 7.0.0.20240515

Bumps [types-docker](https://github.com/python/typeshed) from 7.0.0.20240513 to 7.0.0.20240515.
- [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] <support@github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 99b54249b..4b8666ceb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -318,7 +318,7 @@ dev = [
     "sybil==6.1.1",
     "tenacity==8.3.0",
     "torch==2.3.0",
-    "types-docker==7.0.0.20240513",
+    "types-docker==7.0.0.20240515",
     "types-Pillow==10.2.0.20240511",
     "types-PyYAML==6.0.12.20240311",
     "types-requests==2.31.0.20240406",

From ac06d0718777cc1a1d864b633aae9eec49499dee Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 09:23:13 +0100
Subject: [PATCH 2/3] Resolve pyright issue

---
 tests/mock_vws/test_docker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/mock_vws/test_docker.py b/tests/mock_vws/test_docker.py
index 7c8d68d6b..fec4b1ca6 100644
--- a/tests/mock_vws/test_docker.py
+++ b/tests/mock_vws/test_docker.py
@@ -91,7 +91,7 @@ def fixture_custom_bridge_network() -> Iterator[Network]:
             network.disconnect(container=container)  # pyright: ignore[reportUnknownMemberType]
             container.stop()  # pyright: ignore[reportUnknownMemberType]
             container.remove(v=True, force=True)  # pyright: ignore[reportUnknownMemberType]
-            assert isinstance(container.image, Image)  # pyright: ignore[reportUnknownMemberType]
+            assert container.image is not None
             images_to_remove.add(container.image)
 
         # This does leave behind untagged images.

From c00e44672c07479419132084f68998b0c0360404 Mon Sep 17 00:00:00 2001
From: Adam Dangoor <adamdangoor@gmail.com>
Date: Wed, 15 May 2024 09:27:21 +0100
Subject: [PATCH 3/3] Fix import location

---
 tests/mock_vws/test_docker.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/mock_vws/test_docker.py b/tests/mock_vws/test_docker.py
index fec4b1ca6..7864c9069 100644
--- a/tests/mock_vws/test_docker.py
+++ b/tests/mock_vws/test_docker.py
@@ -13,7 +13,6 @@
 import requests
 from docker.errors import BuildError, NotFound
 from docker.models.containers import Container
-from docker.models.images import Image
 from docker.models.networks import Network
 from mock_vws.database import VuforiaDatabase
 from tenacity import retry
@@ -26,6 +25,8 @@
     import io
     from collections.abc import Iterator
 
+    from docker.models.images import Image
+
 
 # We do not cover this function because hitting particular branches depends on
 # timing.