Skip to content

Commit 7d2d056

Browse files
Merge pull request #2136 from VWS-Python/dependabot/pip/types-docker-7.1.0.20240626
Bump types-docker from 7.1.0.20240625 to 7.1.0.20240626
2 parents 145c745 + 52d81fa commit 7d2d056

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ optional-dependencies.dev = [
8585
"sybil==6.1.1",
8686
"tenacity==8.4.2",
8787
"torch==2.3.1",
88-
"types-docker==7.1.0.20240625",
88+
"types-docker==7.1.0.20240626",
8989
"types-pillow==10.2.0.20240520",
9090
"types-pyyaml==6.0.12.20240311",
9191
"types-requests==2.32.0.20240622",

tests/mock_vws/test_docker.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import pytest
1313
import requests
1414
from docker.errors import BuildError, NotFound
15-
from docker.models.containers import Container
1615
from mock_vws.database import VuforiaDatabase
1716
from tenacity import retry
1817
from tenacity.retry import retry_if_exception_type
@@ -115,7 +114,7 @@ def test_build_and_run(
115114
vwq_tag = f"vws-mock-vwq:latest-{random}"
116115

117116
try:
118-
target_manager_image, _ = client.images.build( # pyright: ignore[reportUnknownMemberType]
117+
target_manager_image, _ = client.images.build(
119118
path=str(repository_root),
120119
dockerfile=str(dockerfile),
121120
tag=target_manager_tag,
@@ -136,15 +135,15 @@ def test_build_and_run(
136135
reason="We do not currently support using Windows containers."
137136
)
138137

139-
vwq_image, _ = client.images.build( # pyright: ignore[reportUnknownMemberType]
138+
vwq_image, _ = client.images.build(
140139
path=str(repository_root),
141140
dockerfile=str(dockerfile),
142141
tag=vwq_tag,
143142
target="vwq",
144143
rm=True,
145144
)
146145

147-
vws_image, _ = client.images.build( # pyright: ignore[reportUnknownMemberType]
146+
vws_image, _ = client.images.build(
148147
path=str(repository_root),
149148
dockerfile=str(dockerfile),
150149
tag=vws_tag,
@@ -158,14 +157,14 @@ def test_build_and_run(
158157
f"http://{target_manager_container_name}:5000"
159158
)
160159

161-
target_manager_container = client.containers.run( # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]
160+
target_manager_container = client.containers.run( # pyright: ignore[reportUnknownMemberType]
162161
image=target_manager_image,
163162
detach=True,
164163
name=target_manager_container_name,
165164
publish_all_ports=True,
166165
network=custom_bridge_network.name,
167166
)
168-
vws_container = client.containers.run( # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]
167+
vws_container = client.containers.run( # pyright: ignore[reportUnknownMemberType]
169168
image=vws_image,
170169
detach=True,
171170
name="vws-mock-vws-" + random,
@@ -175,7 +174,7 @@ def test_build_and_run(
175174
"TARGET_MANAGER_BASE_URL": target_manager_internal_base_url,
176175
},
177176
)
178-
vwq_container = client.containers.run( # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]
177+
vwq_container = client.containers.run( # pyright: ignore[reportUnknownMemberType]
179178
image=vwq_image,
180179
detach=True,
181180
name="vws-mock-vwq-" + random,
@@ -186,9 +185,6 @@ def test_build_and_run(
186185
},
187186
)
188187

189-
assert isinstance(target_manager_container, Container)
190-
assert isinstance(vws_container, Container)
191-
assert isinstance(vwq_container, Container)
192188
for container in (target_manager_container, vws_container, vwq_container):
193189
container.reload()
194190

0 commit comments

Comments
 (0)