From cc97462a796bcb4b45550d2b1c29c54b439d0a8d Mon Sep 17 00:00:00 2001 From: DetachHead <57028336+DetachHead@users.noreply.github.com> Date: Wed, 20 May 2026 13:57:43 +1000 Subject: [PATCH] `requests-oauthlib` - remove dependency on `types-requests` because `requests` now comes with its own type annotations --- stubs/hvac/METADATA.toml | 2 +- .../hvac/hvac/api/system_backend/wrapping.pyi | 4 ++-- stubs/python-jenkins/METADATA.toml | 2 +- stubs/python-jenkins/jenkins/__init__.pyi | 4 ++-- stubs/requests-oauthlib/METADATA.toml | 2 +- .../requests_oauthlib/oauth2_session.pyi | 23 ++++++++++--------- stubs/slumber/METADATA.toml | 2 +- stubs/slumber/slumber/__init__.pyi | 16 +++++++++---- stubs/tensorflow/METADATA.toml | 2 +- .../tensorflow/tensorflow/keras/callbacks.pyi | 4 ++-- 10 files changed, 34 insertions(+), 27 deletions(-) diff --git a/stubs/hvac/METADATA.toml b/stubs/hvac/METADATA.toml index d8318cf01487..fe7a9ba835b4 100644 --- a/stubs/hvac/METADATA.toml +++ b/stubs/hvac/METADATA.toml @@ -1,3 +1,3 @@ version = "2.4.*" upstream-repository = "https://github.com/hvac/hvac" -dependencies = ["types-requests"] +dependencies = ["requests>=2.34.0"] diff --git a/stubs/hvac/hvac/api/system_backend/wrapping.pyi b/stubs/hvac/hvac/api/system_backend/wrapping.pyi index 090f79e47a26..abed47c18ea1 100644 --- a/stubs/hvac/hvac/api/system_backend/wrapping.pyi +++ b/stubs/hvac/hvac/api/system_backend/wrapping.pyi @@ -1,6 +1,6 @@ from hvac.api.system_backend.system_backend_mixin import SystemBackendMixin -from requests.models import _JSON +from requests._types import JsonType class Wrapping(SystemBackendMixin): def unwrap(self, token=None): ... - def wrap(self, payload: _JSON | None = None, ttl: int = 60): ... + def wrap(self, payload: JsonType = None, ttl: int = 60): ... diff --git a/stubs/python-jenkins/METADATA.toml b/stubs/python-jenkins/METADATA.toml index c7623bffe1df..2f60657ee621 100644 --- a/stubs/python-jenkins/METADATA.toml +++ b/stubs/python-jenkins/METADATA.toml @@ -1,3 +1,3 @@ version = "~=1.8.3" upstream-repository = "https://opendev.org/jjb/python-jenkins" -dependencies = ["types-requests"] +dependencies = ["requests>=2.34.0"] diff --git a/stubs/python-jenkins/jenkins/__init__.pyi b/stubs/python-jenkins/jenkins/__init__.pyi index 7c5b4663e8a6..1f392073916e 100644 --- a/stubs/python-jenkins/jenkins/__init__.pyi +++ b/stubs/python-jenkins/jenkins/__init__.pyi @@ -5,8 +5,8 @@ from typing import Any, Final, Literal, TypeAlias, TypedDict, overload, type_che from typing_extensions import Required, deprecated import requests +from requests._types import AuthType from requests.models import Request, Response -from requests.sessions import _Auth LAUNCHER_SSH: Final[str] LAUNCHER_COMMAND: Final[str] @@ -103,7 +103,7 @@ class _Job(TypedDict, total=False): class Jenkins: server: str - auth: _Auth | None + auth: AuthType | None crumb: Mapping[str, Incomplete] | bool | Incomplete timeout: int def __init__( diff --git a/stubs/requests-oauthlib/METADATA.toml b/stubs/requests-oauthlib/METADATA.toml index 7f8247a2e87e..5ae6f9018d46 100644 --- a/stubs/requests-oauthlib/METADATA.toml +++ b/stubs/requests-oauthlib/METADATA.toml @@ -1,3 +1,3 @@ version = "2.0.*" upstream-repository = "https://github.com/requests/requests-oauthlib" -dependencies = ["types-oauthlib", "types-requests"] +dependencies = ["requests >= 2.34.0", "types-oauthlib"] diff --git a/stubs/requests-oauthlib/requests_oauthlib/oauth2_session.pyi b/stubs/requests-oauthlib/requests_oauthlib/oauth2_session.pyi index bdd4b2aa0e0e..001b57f52b77 100644 --- a/stubs/requests-oauthlib/requests_oauthlib/oauth2_session.pyi +++ b/stubs/requests-oauthlib/requests_oauthlib/oauth2_session.pyi @@ -4,6 +4,7 @@ from typing import Any, Literal, Protocol, TypeAlias, TypedDict, overload, type_ import requests from oauthlib.oauth2 import Client +from requests import _types from requests.cookies import RequestsCookieJar _Token: TypeAlias = dict[str, Incomplete] # oauthlib.oauth2.Client.token @@ -120,23 +121,23 @@ class OAuth2Session(requests.Session): self, method: str | bytes, url: str | bytes, - data: requests.sessions._Data | None = None, - headers: requests.sessions._HeadersUpdateMapping | None = None, + data: _types.DataType = None, + headers: _types.HeadersType = None, withhold_token: bool = False, client_id=None, client_secret=None, - files: requests.sessions._Files | None = None, + files: _types.FilesType = None, *, - params: requests.sessions._Params | None = None, - cookies: None | RequestsCookieJar | requests.sessions._TextMapping = None, - auth: requests.sessions._Auth | None = None, - timeout: requests.sessions._Timeout | None = None, + params: _types.ParamsType = None, + cookies: None | RequestsCookieJar | dict[str, str] = None, + auth: _types.AuthType = None, + timeout: _types.TimeoutType = None, allow_redirects: bool = True, - proxies: requests.sessions._TextMapping | None = None, - hooks: requests.sessions._HooksInput | None = None, + proxies: dict[str, str] | None = None, + hooks: _types.HooksInputType | None = None, stream: bool | None = None, - verify: requests.sessions._Verify | None = None, - cert: requests.sessions._Cert | None = None, + verify: _types.VerifyType | None = None, + cert: _types.CertType = None, json=None, ) -> requests.Response: ... diff --git a/stubs/slumber/METADATA.toml b/stubs/slumber/METADATA.toml index 917ca1eec715..c26264bafec2 100644 --- a/stubs/slumber/METADATA.toml +++ b/stubs/slumber/METADATA.toml @@ -1,3 +1,3 @@ version = "0.7.*" upstream-repository = "https://github.com/samgiles/slumber" -dependencies = ["types-requests"] +dependencies = ["requests>=2.34.0"] diff --git a/stubs/slumber/slumber/__init__.pyi b/stubs/slumber/slumber/__init__.pyi index b9dd54415e37..4169c337c152 100644 --- a/stubs/slumber/slumber/__init__.pyi +++ b/stubs/slumber/slumber/__init__.pyi @@ -2,7 +2,7 @@ from typing import Any from typing_extensions import Self from requests import Response, Session -from requests.sessions import _Auth, _Data, _Files, _ParamsMappingValueType +from requests._types import AuthType, DataType, FilesType, _ParamsMappingValueType from .serialize import Serializer @@ -18,9 +18,15 @@ class Resource(ResourceAttributesMixin): def get(self, **kwargs: _ParamsMappingValueType) -> Response: ... def options(self, **kwargs: _ParamsMappingValueType) -> Response: ... def head(self, **kwargs: _ParamsMappingValueType) -> Response: ... - def post(self, data: _Data | None = None, files: _Files | None = None, **kwargs: _ParamsMappingValueType) -> Response: ... - def patch(self, data: _Data | None = None, files: _Files | None = None, **kwargs: _ParamsMappingValueType) -> Response: ... - def put(self, data: _Data | None = None, files: _Files | None = None, **kwargs: _ParamsMappingValueType) -> Response: ... + def post( + self, data: DataType | None = None, files: FilesType | None = None, **kwargs: _ParamsMappingValueType + ) -> Response: ... + def patch( + self, data: DataType | None = None, files: FilesType | None = None, **kwargs: _ParamsMappingValueType + ) -> Response: ... + def put( + self, data: DataType | None = None, files: FilesType | None = None, **kwargs: _ParamsMappingValueType + ) -> Response: ... def delete(self, **kwargs: _ParamsMappingValueType) -> Response: ... def url(self) -> str: ... @@ -29,7 +35,7 @@ class API(ResourceAttributesMixin): def __init__( self, base_url: str | None = None, - auth: _Auth | None = None, + auth: AuthType | None = None, format: str | None = None, append_slash: bool = True, session: Session | None = None, diff --git a/stubs/tensorflow/METADATA.toml b/stubs/tensorflow/METADATA.toml index 33e3b3e45e24..7366aee540b5 100644 --- a/stubs/tensorflow/METADATA.toml +++ b/stubs/tensorflow/METADATA.toml @@ -3,7 +3,7 @@ version = "~=2.18.0" upstream-repository = "https://github.com/tensorflow/tensorflow" # requires a version of numpy with a `py.typed` file -dependencies = ["numpy>=1.20", "types-protobuf", "types-requests"] +dependencies = ["numpy>=1.20", "types-protobuf", "requests>=2.34.0"] extra-description = "Partially generated using [mypy-protobuf==3.6.0](https://github.com/nipunn1313/mypy-protobuf/tree/v3.6.0) and libprotoc 27.2 on `tensorflow==2.18.0`." partial-stub = true diff --git a/stubs/tensorflow/tensorflow/keras/callbacks.pyi b/stubs/tensorflow/tensorflow/keras/callbacks.pyi index 74037b3a6501..2e4897fe78a5 100644 --- a/stubs/tensorflow/tensorflow/keras/callbacks.pyi +++ b/stubs/tensorflow/tensorflow/keras/callbacks.pyi @@ -2,7 +2,7 @@ from collections.abc import Callable, Mapping, Sequence from typing import Any, Literal, TypeAlias import tensorflow as tf -from requests.api import _HeadersMapping +from requests._types import HeadersType from tensorflow.keras import Model from tensorflow.keras.optimizers.schedules import LearningRateSchedule @@ -143,7 +143,7 @@ class RemoteMonitor(Callback): root: str = "http://localhost:9000", path: str = "/publish/epoch/end/", field: str = "data", - headers: _HeadersMapping | None = None, + headers: HeadersType = None, send_as_json: bool = False, ) -> None: ...