Skip to content

Commit cc97462

Browse files
committed
requests-oauthlib - remove dependency on types-requests because requests now comes with its own type annotations
1 parent 60a6695 commit cc97462

10 files changed

Lines changed: 34 additions & 27 deletions

File tree

stubs/hvac/METADATA.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version = "2.4.*"
22
upstream-repository = "https://github.com/hvac/hvac"
3-
dependencies = ["types-requests"]
3+
dependencies = ["requests>=2.34.0"]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from hvac.api.system_backend.system_backend_mixin import SystemBackendMixin
2-
from requests.models import _JSON
2+
from requests._types import JsonType
33

44
class Wrapping(SystemBackendMixin):
55
def unwrap(self, token=None): ...
6-
def wrap(self, payload: _JSON | None = None, ttl: int = 60): ...
6+
def wrap(self, payload: JsonType = None, ttl: int = 60): ...

stubs/python-jenkins/METADATA.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version = "~=1.8.3"
22
upstream-repository = "https://opendev.org/jjb/python-jenkins"
3-
dependencies = ["types-requests"]
3+
dependencies = ["requests>=2.34.0"]

stubs/python-jenkins/jenkins/__init__.pyi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ from typing import Any, Final, Literal, TypeAlias, TypedDict, overload, type_che
55
from typing_extensions import Required, deprecated
66

77
import requests
8+
from requests._types import AuthType
89
from requests.models import Request, Response
9-
from requests.sessions import _Auth
1010

1111
LAUNCHER_SSH: Final[str]
1212
LAUNCHER_COMMAND: Final[str]
@@ -103,7 +103,7 @@ class _Job(TypedDict, total=False):
103103

104104
class Jenkins:
105105
server: str
106-
auth: _Auth | None
106+
auth: AuthType | None
107107
crumb: Mapping[str, Incomplete] | bool | Incomplete
108108
timeout: int
109109
def __init__(
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version = "2.0.*"
22
upstream-repository = "https://github.com/requests/requests-oauthlib"
3-
dependencies = ["types-oauthlib", "types-requests"]
3+
dependencies = ["requests >= 2.34.0", "types-oauthlib"]

stubs/requests-oauthlib/requests_oauthlib/oauth2_session.pyi

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ from typing import Any, Literal, Protocol, TypeAlias, TypedDict, overload, type_
44

55
import requests
66
from oauthlib.oauth2 import Client
7+
from requests import _types
78
from requests.cookies import RequestsCookieJar
89

910
_Token: TypeAlias = dict[str, Incomplete] # oauthlib.oauth2.Client.token
@@ -120,23 +121,23 @@ class OAuth2Session(requests.Session):
120121
self,
121122
method: str | bytes,
122123
url: str | bytes,
123-
data: requests.sessions._Data | None = None,
124-
headers: requests.sessions._HeadersUpdateMapping | None = None,
124+
data: _types.DataType = None,
125+
headers: _types.HeadersType = None,
125126
withhold_token: bool = False,
126127
client_id=None,
127128
client_secret=None,
128-
files: requests.sessions._Files | None = None,
129+
files: _types.FilesType = None,
129130
*,
130-
params: requests.sessions._Params | None = None,
131-
cookies: None | RequestsCookieJar | requests.sessions._TextMapping = None,
132-
auth: requests.sessions._Auth | None = None,
133-
timeout: requests.sessions._Timeout | None = None,
131+
params: _types.ParamsType = None,
132+
cookies: None | RequestsCookieJar | dict[str, str] = None,
133+
auth: _types.AuthType = None,
134+
timeout: _types.TimeoutType = None,
134135
allow_redirects: bool = True,
135-
proxies: requests.sessions._TextMapping | None = None,
136-
hooks: requests.sessions._HooksInput | None = None,
136+
proxies: dict[str, str] | None = None,
137+
hooks: _types.HooksInputType | None = None,
137138
stream: bool | None = None,
138-
verify: requests.sessions._Verify | None = None,
139-
cert: requests.sessions._Cert | None = None,
139+
verify: _types.VerifyType | None = None,
140+
cert: _types.CertType = None,
140141
json=None,
141142
) -> requests.Response: ...
142143

stubs/slumber/METADATA.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version = "0.7.*"
22
upstream-repository = "https://github.com/samgiles/slumber"
3-
dependencies = ["types-requests"]
3+
dependencies = ["requests>=2.34.0"]

stubs/slumber/slumber/__init__.pyi

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ from typing import Any
22
from typing_extensions import Self
33

44
from requests import Response, Session
5-
from requests.sessions import _Auth, _Data, _Files, _ParamsMappingValueType
5+
from requests._types import AuthType, DataType, FilesType, _ParamsMappingValueType
66

77
from .serialize import Serializer
88

@@ -18,9 +18,15 @@ class Resource(ResourceAttributesMixin):
1818
def get(self, **kwargs: _ParamsMappingValueType) -> Response: ...
1919
def options(self, **kwargs: _ParamsMappingValueType) -> Response: ...
2020
def head(self, **kwargs: _ParamsMappingValueType) -> Response: ...
21-
def post(self, data: _Data | None = None, files: _Files | None = None, **kwargs: _ParamsMappingValueType) -> Response: ...
22-
def patch(self, data: _Data | None = None, files: _Files | None = None, **kwargs: _ParamsMappingValueType) -> Response: ...
23-
def put(self, data: _Data | None = None, files: _Files | None = None, **kwargs: _ParamsMappingValueType) -> Response: ...
21+
def post(
22+
self, data: DataType | None = None, files: FilesType | None = None, **kwargs: _ParamsMappingValueType
23+
) -> Response: ...
24+
def patch(
25+
self, data: DataType | None = None, files: FilesType | None = None, **kwargs: _ParamsMappingValueType
26+
) -> Response: ...
27+
def put(
28+
self, data: DataType | None = None, files: FilesType | None = None, **kwargs: _ParamsMappingValueType
29+
) -> Response: ...
2430
def delete(self, **kwargs: _ParamsMappingValueType) -> Response: ...
2531
def url(self) -> str: ...
2632

@@ -29,7 +35,7 @@ class API(ResourceAttributesMixin):
2935
def __init__(
3036
self,
3137
base_url: str | None = None,
32-
auth: _Auth | None = None,
38+
auth: AuthType | None = None,
3339
format: str | None = None,
3440
append_slash: bool = True,
3541
session: Session | None = None,

stubs/tensorflow/METADATA.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
version = "~=2.18.0"
44
upstream-repository = "https://github.com/tensorflow/tensorflow"
55
# requires a version of numpy with a `py.typed` file
6-
dependencies = ["numpy>=1.20", "types-protobuf", "types-requests"]
6+
dependencies = ["numpy>=1.20", "types-protobuf", "requests>=2.34.0"]
77
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`."
88
partial-stub = true
99

stubs/tensorflow/tensorflow/keras/callbacks.pyi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ from collections.abc import Callable, Mapping, Sequence
22
from typing import Any, Literal, TypeAlias
33

44
import tensorflow as tf
5-
from requests.api import _HeadersMapping
5+
from requests._types import HeadersType
66
from tensorflow.keras import Model
77
from tensorflow.keras.optimizers.schedules import LearningRateSchedule
88

@@ -143,7 +143,7 @@ class RemoteMonitor(Callback):
143143
root: str = "http://localhost:9000",
144144
path: str = "/publish/epoch/end/",
145145
field: str = "data",
146-
headers: _HeadersMapping | None = None,
146+
headers: HeadersType = None,
147147
send_as_json: bool = False,
148148
) -> None: ...
149149

0 commit comments

Comments
 (0)