Skip to content

Commit 018dadc

Browse files
docker - remove dependency on types-requests because requests ships types'
Requests 2.34 ships inline type information, so depend on it directly instead of types-requests: - types-requests -> requests>=2.34.0: Requests now ships its own type information, so the separate stub package is redundant. As per #15813 I've added the lower bound. - `Sequence[str]` -> `list[str]`: `APIClient` inherits `Session.__attrs__`, which Requests declares as `list[str]`. An overriding mutable attribute must keep the same type. - `ConnectionPool` -> `HTTPConnectionPool`: Requests declares `HTTPAdapter.get_connection_with_tls_context()` as returning `HTTPConnectionPool`. Docker’s override cannot use the broader `ConnectionPool` return type. Co-Authored-By: Factory Droid (GPT-5.6 Sol)
1 parent a746e49 commit 018dadc

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎stubs/docker/METADATA.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version = "7.2.*"
22
upstream-repository = "https://github.com/docker/docker-py"
3-
dependencies = ["types-requests", "urllib3>=2"]
3+
dependencies = ["requests>=2.34.0", "urllib3>=2"]
44
optional-dependencies = ["types-paramiko"]
55

66
[tool.stubtest]

‎stubs/docker/docker/api/client.pyi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from _typeshed import Incomplete
2-
from collections.abc import Mapping, Sequence
2+
from collections.abc import Mapping
33

44
import requests
55
from docker.tls import TLSConfig
@@ -33,7 +33,7 @@ class APIClient(
3333
SwarmApiMixin,
3434
VolumeApiMixin,
3535
):
36-
__attrs__: Sequence[str]
36+
__attrs__: list[str]
3737
base_url: str
3838
timeout: int
3939
credstore_env: Mapping[Incomplete, Incomplete] | None
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from collections.abc import Mapping
22

33
import requests.adapters
4-
from urllib3.connectionpool import ConnectionPool
4+
from urllib3.connectionpool import HTTPConnectionPool
55

66
class BaseHTTPAdapter(requests.adapters.HTTPAdapter):
77
def close(self) -> None: ...
@@ -11,4 +11,4 @@ class BaseHTTPAdapter(requests.adapters.HTTPAdapter):
1111
verify: bool | str | None,
1212
proxies: Mapping[str, str] | None = None,
1313
cert: tuple[str, str] | str | None = None,
14-
) -> ConnectionPool: ...
14+
) -> HTTPConnectionPool: ...

0 commit comments

Comments
 (0)