Update most test/lint dependencies (#15582)

stubs/boltons/boltons/cacheutils.pyi

@@ -125,9 +125,9 @@ class ThresholdCounter(Generic[_T]):
     def __contains__(self, key: _T) -> bool: ...
     def iterkeys(self) -> Iterator[_T]: ...
     def keys(self) -> list[_T]: ...
-    def itervalues(self) -> Generator[int, None, None]: ...
+    def itervalues(self) -> Generator[int]: ...
     def values(self) -> list[int]: ...
-    def iteritems(self) -> Generator[tuple[_T, int], None, None]: ...
+    def iteritems(self) -> Generator[tuple[_T, int]]: ...
     def items(self) -> list[tuple[_T, int]]: ...
     def get(self, key: _T, default: int = 0) -> int: ...
     def update(self, iterable: Iterable[_T] | Mapping[_T, int], **kwargs: Iterable[_T] | Mapping[_T, int]) -> None: ...

stubs/boltons/boltons/dictutils.pyi

@@ -22,9 +22,9 @@ class OrderedMultiDict(dict[_KT, _VT]):
     def getlist(self, k: _KT, default: list[_VT] = ...) -> list[_VT]: ...
     def inverted(self) -> Self: ...
     def items(self, multi: bool = False) -> list[tuple[_KT, _VT]]: ...  # type: ignore[override]
-    def iteritems(self, multi: bool = False) -> Generator[tuple[_KT, _VT], None, None]: ...
-    def iterkeys(self, multi: bool = False) -> Generator[_KT, None, None]: ...
-    def itervalues(self, multi: bool = False) -> Generator[_VT, None, None]: ...
+    def iteritems(self, multi: bool = False) -> Generator[tuple[_KT, _VT]]: ...
+    def iterkeys(self, multi: bool = False) -> Generator[_KT]: ...
+    def itervalues(self, multi: bool = False) -> Generator[_VT]: ...
     def keys(self, multi: bool = False) -> list[_KT]: ...  # type: ignore[override]
     def pop(self, k: _KT, default: _VT = ...) -> _VT: ...  # type: ignore[override]
     def popall(self, k: _KT, default: _VT = ...) -> list[_VT]: ...
@@ -47,8 +47,8 @@ OMD: TypeAlias = OrderedMultiDict[_KT, _VT]
 MultiDict: TypeAlias = OrderedMultiDict[_KT, _VT]
 
 class FastIterOrderedMultiDict(OrderedMultiDict[_KT, _VT]):  # undocumented
-    def iteritems(self, multi: bool = False) -> Generator[tuple[_KT, _VT], None, None]: ...
-    def iterkeys(self, multi: bool = False) -> Generator[_KT, None, None]: ...
+    def iteritems(self, multi: bool = False) -> Generator[tuple[_KT, _VT]]: ...
+    def iterkeys(self, multi: bool = False) -> Generator[_KT]: ...
 
 class OneToOne(dict[_KT, _VT]):
     __slots__ = ("inv",)
@@ -77,7 +77,7 @@ class ManyToMany(dict[_KT, frozenset[_VT]]):
     def __setitem__(self, key: _KT, vals: Iterable[_VT]) -> None: ...
     def add(self, key: _KT, val: _VT) -> None: ...
     def get(self, key: _KT, default: frozenset[_VT] = ...) -> frozenset[_VT]: ...  # type: ignore[override]
-    def iteritems(self) -> Generator[tuple[_KT, _VT], None, None]: ...
+    def iteritems(self) -> Generator[tuple[_KT, _VT]]: ...
     def keys(self): ...
     def remove(self, key: _KT, val: _VT) -> None: ...
     def replace(self, key: _KT, newkey: _KT) -> None: ...

stubs/boltons/boltons/fileutils.pyi

@@ -51,7 +51,7 @@ def iter_find_files(
     ignored: str | Iterable[str] | None = None,
     include_dirs: bool = False,
     max_depth: int | None = None,
-) -> Generator[str, None, None]: ...
+) -> Generator[str]: ...
 @overload
 def copy_tree(
     src: _StrPathT, dst: _StrPathT, symlinks: bool = False, ignore: Callable[[_StrPathT, list[str]], Iterable[str]] | None = None

stubs/boltons/boltons/iterutils.pyi

@@ -7,24 +7,24 @@ def is_collection(obj) -> bool: ...
 def split(src, sep=None, maxsplit=None): ...
 def split_iter(src, sep=None, maxsplit=None) -> Generator[Incomplete, None, Incomplete]: ...
 def lstrip(iterable, strip_value=None): ...
-def lstrip_iter(iterable, strip_value=None) -> Generator[Incomplete, None, None]: ...
+def lstrip_iter(iterable, strip_value=None) -> Generator[Incomplete]: ...
 def rstrip(iterable, strip_value=None): ...
-def rstrip_iter(iterable, strip_value=None) -> Generator[Incomplete, None, None]: ...
+def rstrip_iter(iterable, strip_value=None) -> Generator[Incomplete]: ...
 def strip(iterable, strip_value=None): ...
 def strip_iter(iterable, strip_value=None): ...
 def chunked(src, size, count=None, **kw): ...
 def chunked_iter(src, size, **kw) -> Generator[Incomplete, None, Incomplete]: ...
 def chunk_ranges(
     input_size: int, chunk_size: int, input_offset: int = 0, overlap_size: int = 0, align: bool = False
-) -> Generator[tuple[int, int], None, None]: ...
+) -> Generator[tuple[int, int]]: ...
 def pairwise(src, end=...): ...
 def pairwise_iter(src, end=...): ...
 def windowed(src, size, fill=...): ...
 def windowed_iter(src, size, fill=...): ...
-def xfrange(stop, start=None, step: float = 1.0) -> Generator[Incomplete, None, None]: ...
+def xfrange(stop, start=None, step: float = 1.0) -> Generator[Incomplete]: ...
 def frange(stop, start=None, step: float = 1.0): ...
 def backoff(start, stop, count=None, factor: float = 2.0, jitter: bool = False): ...
-def backoff_iter(start, stop, count=None, factor: float = 2.0, jitter: bool = False) -> Generator[Incomplete, None, None]: ...
+def backoff_iter(start, stop, count=None, factor: float = 2.0, jitter: bool = False) -> Generator[Incomplete]: ...
 def bucketize(src, key=..., value_transform=None, key_filter=None): ...
 def partition(src, key=...): ...
 def unique(src, key=None): ...
@@ -32,7 +32,7 @@ def unique_iter(src, key=None) -> Generator[Incomplete, None, Incomplete]: ...
 def redundant(src, key=None, groups: bool = False): ...
 def one(src, default=None, key=None): ...
 def first(iterable, default=None, key=None): ...
-def flatten_iter(iterable) -> Generator[Incomplete, None, None]: ...
+def flatten_iter(iterable) -> Generator[Incomplete]: ...
 def flatten(iterable): ...
 def same(iterable, ref=...): ...
 def default_visit(path, key, value): ...

stubs/boltons/boltons/jsonutils.pyi

@@ -5,13 +5,11 @@ from typing_extensions import Self
 @overload
 def reverse_iter_lines(
     file_obj: IO[bytes], blocksize: int = 4096, preseek: bool = True, encoding: None = None
-) -> Generator[bytes, None, None]: ...
+) -> Generator[bytes]: ...
 @overload
-def reverse_iter_lines(
-    file_obj: IO[str], blocksize: int = 4096, preseek: bool = True, *, encoding: str
-) -> Generator[str, None, None]: ...
+def reverse_iter_lines(file_obj: IO[str], blocksize: int = 4096, preseek: bool = True, *, encoding: str) -> Generator[str]: ...
 @overload
-def reverse_iter_lines(file_obj: IO[str], blocksize: int, preseek: bool, encoding: str) -> Generator[str, None, None]: ...
+def reverse_iter_lines(file_obj: IO[str], blocksize: int, preseek: bool, encoding: str) -> Generator[str]: ...
 
 class JSONLIterator:
     ignore_errors: bool

stubs/boltons/boltons/setutils.pyi

@@ -17,7 +17,7 @@ class IndexedSet(MutableSet[Any]):
     def __len__(self) -> int: ...
     def __contains__(self, item: Any) -> bool: ...
     def __iter__(self) -> Iterator[Any]: ...
-    def __reversed__(self) -> Generator[Any, None, None]: ...
+    def __reversed__(self) -> Generator[Any]: ...
     @classmethod
     def from_iterable(cls, it: Iterable[Any]) -> Self: ...
     def add(self, item: Any) -> None: ...
@@ -28,9 +28,9 @@ class IndexedSet(MutableSet[Any]):
     def issubset(self, other: Collection[Any]) -> bool: ...
     def issuperset(self, other: Collection[Any]) -> bool: ...
     def union(self, *others: Iterable[Any]) -> Self: ...
-    def iter_intersection(self, *others: Container[Any]) -> Generator[Any, None, None]: ...
+    def iter_intersection(self, *others: Container[Any]) -> Generator[Any]: ...
     def intersection(self, *others: Container[Any]) -> Self: ...
-    def iter_difference(self, *others: Iterable[Any]) -> Generator[Any, None, None]: ...
+    def iter_difference(self, *others: Iterable[Any]) -> Generator[Any]: ...
     def difference(self, *others: Iterable[Any]) -> Self: ...
     def symmetric_difference(self, *others: Container[Any]) -> Self: ...
     # __or__ = union

stubs/boltons/boltons/strutils.pyi

@@ -42,7 +42,7 @@ class HTMLTextExtractor(HTMLParser):
 def html2text(html: str) -> str: ...
 def gunzip_bytes(bytestring: ReadableBuffer) -> bytes: ...
 def gzip_bytes(bytestring: ReadableBuffer, level: int = 6) -> int: ...
-def iter_splitlines(text: str) -> Generator[str, None, None]: ...
+def iter_splitlines(text: str) -> Generator[str]: ...
 def indent(text: str, margin: str, newline: str = "\n", key: Callable[[str], bool] = ...) -> str: ...
 def is_uuid(obj, version: int = 4) -> bool: ...
 def escape_shell_args(args: Iterable[str], sep: str = " ", style: Literal["cmd", "sh"] | None = None) -> str: ...

stubs/boltons/boltons/timeutils.pyi

@@ -14,7 +14,7 @@ def decimal_relative_time(
 ) -> tuple[float, str]: ...
 def relative_time(d: datetime, other: datetime | None = None, ndigits: int = 0) -> str: ...
 def strpdate(string: str, format: str) -> date: ...
-def daterange(start: date, stop: date, step: int = 1, inclusive: bool = False) -> Generator[date, None, None]: ...
+def daterange(start: date, stop: date, step: int = 1, inclusive: bool = False) -> Generator[date]: ...
 
 ZERO: timedelta
 HOUR: timedelta