basedpyright 1.22.0 → 1.22.1

package/dist/typeshed-fallback/stubs/icalendar/icalendar/timezone/__init__.pyi

@@ -1,6 +1,7 @@
-from ..timezone.tzp import TZP  # to prevent "tzp" from being defined here
+from ..timezone.tzp import TZP as TZP  # to prevent "tzp" from being defined here
+from .tzid import tzid_from_dt as tzid_from_dt, tzid_from_tzinfo as tzid_from_tzinfo, tzids_from_tzinfo as tzids_from_tzinfo
 
-__all__ = ["tzp", "use_pytz", "use_zoneinfo"]
+__all__ = ["TZP", "tzp", "use_pytz", "use_zoneinfo", "tzid_from_tzinfo", "tzid_from_dt", "tzids_from_tzinfo"]
 
 tzp: TZP
 

package/dist/typeshed-fallback/stubs/icalendar/icalendar/timezone/equivalent_timezone_ids.pyi

@@ -0,0 +1,15 @@
+import datetime
+from collections.abc import Callable
+from typing import Final
+
+__all__ = ["main"]
+
+def check(dt: datetime.datetime, tz: datetime.tzinfo) -> tuple[datetime.datetime, datetime.timedelta]: ...
+def checks(tz: datetime.tzinfo) -> list[tuple[datetime.datetime, datetime.timedelta]]: ...
+
+START: Final[datetime.datetime]
+END: Final[datetime.datetime]
+
+DTS: Final[list[datetime.datetime]]
+
+def main(create_timezones: list[Callable[[str], datetime.tzinfo]], name: str, pool_size: int = ...) -> None: ...

package/dist/typeshed-fallback/stubs/icalendar/icalendar/timezone/equivalent_timezone_ids_result.pyi

@@ -0,0 +1,6 @@
+from _typeshed import Incomplete
+from typing import Final
+
+__all__ = ["lookup"]
+
+lookup: Final[Incomplete]

package/dist/typeshed-fallback/stubs/icalendar/icalendar/timezone/tzid.pyi

@@ -0,0 +1,8 @@
+import datetime
+
+__all__ = ["tzid_from_tzinfo", "tzid_from_dt", "tzids_from_tzinfo"]
+
+def tzids_from_tzinfo(tzinfo: datetime.tzinfo | None) -> tuple[str, ...]: ...
+def tzid_from_tzinfo(tzinfo: datetime.tzinfo | None) -> str | None: ...
+def tzid_from_dt(dt: datetime.datetime) -> str | None: ...
+def tzinfo2tzids(tzinfo: datetime.tzinfo | None) -> set[str]: ...

package/dist/typeshed-fallback/stubs/icalendar/icalendar/timezone/tzp.pyi

@@ -17,8 +17,8 @@ class TZP:
     def use_zoneinfo(self) -> None: ...
     def use(self, provider: str | TZProvider) -> None: ...
     def use_default(self) -> None: ...
-    def localize_utc(self, dt: datetime.datetime) -> datetime.datetime: ...
-    def localize(self, dt: datetime.datetime, tz: datetime.tzinfo | str) -> datetime.datetime: ...
+    def localize_utc(self, dt: datetime.date) -> datetime.datetime: ...
+    def localize(self, dt: datetime.date, tz: datetime.tzinfo | str) -> datetime.datetime: ...
     def cache_timezone_component(self, timezone_component: Timezone) -> None: ...
     def fix_rrule_until(self, rrule: rrule, ical_rrule: vRecur) -> None: ...
     def create_timezone(self, timezone_component: Timezone) -> datetime.tzinfo: ...

package/dist/typeshed-fallback/stubs/icalendar/icalendar/tools.pyi

@@ -1,8 +1,12 @@
+import datetime
 from typing import Final
+from typing_extensions import TypeGuard, TypeIs
+
+from pytz.tzinfo import BaseTzInfo
 
 from .prop import vText
 
-__all__ = ["UIDGenerator"]
+__all__ = ["UIDGenerator", "is_date", "is_datetime", "to_datetime", "is_pytz", "is_pytz_dt", "normalize_pytz"]
 
 class UIDGenerator:
     chars: Final[list[str]]
@@ -10,3 +14,10 @@ class UIDGenerator:
     def rnd_string(length: int = 16) -> str: ...
     @staticmethod
     def uid(host_name: str = "example.com", unique: str = "") -> vText: ...
+
+def is_date(dt: datetime.date) -> bool: ...  # and not datetime.date
+def is_datetime(dt: datetime.date) -> TypeIs[datetime.datetime]: ...
+def to_datetime(dt: datetime.date) -> datetime.datetime: ...
+def is_pytz(tz: datetime.tzinfo) -> TypeIs[BaseTzInfo]: ...
+def is_pytz_dt(dt: datetime.date) -> TypeGuard[datetime.datetime]: ...  # and dt.tzinfo is BaseTZInfo
+def normalize_pytz(dt: datetime.date) -> datetime.datetime: ...

package/dist/typeshed-fallback/stubs/networkx/METADATA.toml

@@ -1,4 +1,4 @@
-version = "3.3"
+version = "3.4.2"
 upstream_repository = "https://github.com/networkx/networkx"
 # requires a version of numpy with a `py.typed` file
 requires = ["numpy>=1.20"]

package/dist/typeshed-fallback/stubs/networkx/networkx/algorithms/components/strongly_connected.pyi

@@ -9,8 +9,6 @@ def strongly_connected_components(G: Graph[_Node]) -> Generator[set[_Node], None
 @_dispatchable
 def kosaraju_strongly_connected_components(G: Graph[_Node], source: _Node | None = None) -> Generator[set[_Node], None, None]: ...
 @_dispatchable
-def strongly_connected_components_recursive(G: Graph[_Node]) -> Generator[set[_Node], None, None]: ...
-@_dispatchable
 def number_strongly_connected_components(G: Graph[Hashable]) -> int: ...
 @_dispatchable
 def is_strongly_connected(G: Graph[Hashable]) -> bool: ...

package/dist/typeshed-fallback/stubs/networkx/networkx/algorithms/tree/branchings.pyi

@@ -2,8 +2,6 @@ from _typeshed import Incomplete
 from collections.abc import Iterator
 from dataclasses import dataclass
 
-from networkx.classes.graph import _Node
-from networkx.classes.multidigraph import MultiDiGraph
 from networkx.utils.backends import _dispatchable
 
 __all__ = [
@@ -14,41 +12,12 @@ __all__ = [
     "maximum_spanning_arborescence",
     "minimum_spanning_arborescence",
     "ArborescenceIterator",
-    "Edmonds",
 ]
 
 @_dispatchable
 def branching_weight(G, attr: str = "weight", default: float = 1): ...
 @_dispatchable
 def greedy_branching(G, attr: str = "weight", default: float = 1, kind: str = "max", seed: Incomplete | None = None): ...
-
-class MultiDiGraph_EdgeKey(MultiDiGraph[_Node]):
-    edge_index: Incomplete
-    def __init__(self, incoming_graph_data: Incomplete | None = None, **attr) -> None: ...
-    def remove_node(self, n) -> None: ...
-    def remove_nodes_from(self, nbunch) -> None: ...
-    def add_edge(self, u_for_edge, v_for_edge, key_for_edge, **attr) -> None: ...  # type: ignore[override]  # Graph.add_edge won't accept a `key_for_edge` keyword argument.
-    def add_edges_from(self, ebunch_to_add, **attr) -> None: ...
-    def remove_edge_with_key(self, key) -> None: ...
-    def remove_edges_from(self, ebunch) -> None: ...
-
-class Edmonds:
-    G_original: Incomplete
-    store: bool
-    edges: Incomplete
-    template: Incomplete
-    def __init__(self, G, seed: Incomplete | None = None) -> None: ...
-    def find_optimum(
-        self,
-        attr: str = "weight",
-        default: float = 1,
-        kind: str = "max",
-        style: str = "branching",
-        preserve_attrs: bool = False,
-        partition: Incomplete | None = None,
-        seed: Incomplete | None = None,
-    ): ...
-
 @_dispatchable
 def maximum_branching(
     G, attr: str = "weight", default: float = 1, preserve_attrs: bool = False, partition: Incomplete | None = None

package/dist/typeshed-fallback/stubs/networkx/networkx/algorithms/tree/operations.pyi

@@ -3,4 +3,4 @@ from _typeshed import Incomplete
 from networkx.utils.backends import _dispatchable
 
 @_dispatchable
-def join(rooted_trees, label_attribute: Incomplete | None = None): ...
+def join_trees(rooted_trees, label_attribute: Incomplete | None = None): ...

package/dist/typeshed-fallback/stubs/networkx/networkx/classes/reportviews.pyi

@@ -1,4 +1,5 @@
 from _typeshed import Incomplete, Unused
+from abc import ABC
 from collections.abc import Iterable, Iterator, Mapping, Set as AbstractSet
 from typing import Any, Generic, Literal, TypeVar, overload
 from typing_extensions import Self
@@ -45,8 +46,9 @@ class MultiDegreeView(DiDegreeView[_Node]): ...
 class DiMultiDegreeView(DiDegreeView[_Node]): ...
 class InMultiDegreeView(DiDegreeView[_Node]): ...
 class OutMultiDegreeView(DiDegreeView[_Node]): ...
+class EdgeViewABC(ABC): ...
 
-class OutEdgeDataView(Generic[_Node, _D]):
+class OutEdgeDataView(EdgeViewABC, Generic[_Node, _D]):
     def __init__(
         self, viewer, nbunch: _NBunch[_Node] = None, data: bool = False, *, default: Incomplete | None = None
     ) -> None: ...

package/dist/typeshed-fallback/stubs/networkx/networkx/drawing/layout.pyi

@@ -1,5 +1,7 @@
 from _typeshed import Incomplete
 
+import numpy
+
 def random_layout(G, center: Incomplete | None = None, dim: int = 2, seed: Incomplete | None = None): ...
 def circular_layout(G, scale: float = 1, center: Incomplete | None = None, dim: int = 2): ...
 def shell_layout(
@@ -54,6 +56,8 @@ def arf_layout(
     etol: float = 1e-06,
     dt: float = 0.001,
     max_iter: int = 1000,
+    *,
+    seed: int | numpy.random.RandomState | None = None,
 ): ...
 def rescale_layout(pos, scale: float = 1): ...
 def rescale_layout_dict(pos, scale: float = 1): ...

package/dist/typeshed-fallback/stubs/networkx/networkx/generators/trees.pyi

@@ -1,10 +1,6 @@
-from _typeshed import Incomplete
-
 from networkx.utils.backends import _dispatchable
 
 @_dispatchable
 def prefix_tree(paths): ...
 @_dispatchable
 def prefix_tree_recursive(paths): ...
-@_dispatchable
-def random_tree(n, seed: Incomplete | None = None, create_using: Incomplete | None = None): ...

package/dist/typeshed-fallback/stubs/networkx/networkx/readwrite/json_graph/node_link.pyi

@@ -3,7 +3,15 @@ from _typeshed import Incomplete
 from networkx.utils.backends import _dispatchable
 
 def node_link_data(
-    G, *, source: str = "source", target: str = "target", name: str = "id", key: str = "key", link: str = "links"
+    G,
+    *,
+    source: str = "source",
+    target: str = "target",
+    name: str = "id",
+    key: str = "key",
+    edges: str | None = None,
+    nodes: str = "nodes",
+    link: str | None = None,
 ): ...
 @_dispatchable
 def node_link_graph(
@@ -16,5 +24,7 @@ def node_link_graph(
     target: str = "target",
     name: str = "id",
     key: str = "key",
-    link: str = "links",
+    edges: str | None = None,
+    nodes: str = "nodes",
+    link: str | None = None,
 ): ...

package/dist/typeshed-fallback/stubs/networkx/networkx/readwrite/text.pyi

@@ -2,7 +2,7 @@ from _typeshed import Incomplete
 from collections.abc import Generator
 from typing import ClassVar
 
-__all__ = ["forest_str", "generate_network_text", "write_network_text"]
+__all__ = ["generate_network_text", "write_network_text"]
 
 class _AsciiBaseGlyphs:
     empty: ClassVar[str]
@@ -58,6 +58,3 @@ def write_network_text(
     end: str = "\n",
     vertical_chains=False,
 ) -> None: ...
-def forest_str(
-    graph, with_labels: bool = True, sources: Incomplete | None = None, write: Incomplete | None = None, ascii_only: bool = False
-): ...

package/dist/typeshed-fallback/stubs/networkx/networkx/utils/configs.pyi

@@ -26,7 +26,25 @@ class NetworkXConfig(Config):
     backend_priority: list[str]
     backends: Config
     cache_converted_graphs: bool
-    def __init__(self, *, backend_priority: list[str], backends: Config, cache_converted_graphs: bool) -> None: ...
-    def __new__(cls, *, backend_priority: list[str], backends: Config, cache_converted_graphs: bool) -> Self: ...
+    fallback_to_nx: bool
+    warnings_to_ignore: set[str]
+    def __init__(
+        self,
+        *,
+        backend_priority: list[str],
+        backends: Config,
+        cache_converted_graphs: bool,
+        fallback_to_nx: bool,
+        warnings_to_ignore: set[str],
+    ) -> None: ...
+    def __new__(
+        cls,
+        *,
+        backend_priority: list[str],
+        backends: Config,
+        cache_converted_graphs: bool,
+        fallback_to_nx: bool,
+        warnings_to_ignore: set[str],
+    ) -> Self: ...
 
 config: NetworkXConfig

package/dist/typeshed-fallback/stubs/openpyxl/openpyxl/__init__.pyi

@@ -1,4 +1,4 @@
-from _typeshed import StrPath, SupportsRead
+from _typeshed import StrPath, SupportsRead, SupportsWrite
 from typing import IO, Literal, Protocol
 from typing_extensions import TypeAlias
 
@@ -25,6 +25,7 @@ _VisibilityType: TypeAlias = Literal["visible", "hidden", "veryHidden"]  # noqa:
 # TODO: Use a proper protocol from ZipFile. See: #10880
 # This alias is to minimize false-positives
 _ZipFileFileProtocol: TypeAlias = StrPath | IO[bytes] | SupportsRead[bytes]  # noqa: Y047
+_ZipFileFileWriteProtocol: TypeAlias = StrPath | IO[bytes] | SupportsWrite[bytes]  # noqa: Y047
 
 class _Decodable(Protocol):  # noqa: Y046
     def decode(self, encoding: str, /) -> str: ...

package/dist/typeshed-fallback/stubs/openpyxl/openpyxl/cell/__init__.pyi

@@ -22,3 +22,5 @@ _CellValue: TypeAlias = (  # noqa: Y047 # Used in other modules
     | ArrayFormula
 )
 _AnyCellValue: TypeAlias = Any  # Any of _CellValue # noqa: Y047 # Used in other modules
+
+_CellOrMergedCell: TypeAlias = Cell | MergedCell  # noqa: Y047 # Used in other modules

package/dist/typeshed-fallback/stubs/openpyxl/openpyxl/cell/_writer.pyi

@@ -1,7 +1,9 @@
 from _typeshed import Incomplete, Unused
 
-def etree_write_cell(xf, worksheet: Unused, cell, styled: Incomplete | None = None) -> None: ...
-def lxml_write_cell(xf, worksheet: Unused, cell, styled: bool = False) -> None: ...
+from openpyxl.cell import _CellOrMergedCell
+
+def etree_write_cell(xf, worksheet: Unused, cell: _CellOrMergedCell, styled: Incomplete | None = None) -> None: ...
+def lxml_write_cell(xf, worksheet: Unused, cell: _CellOrMergedCell, styled: bool = False) -> None: ...
 
 write_cell = lxml_write_cell
 write_cell = etree_write_cell

package/dist/typeshed-fallback/stubs/openpyxl/openpyxl/cell/cell.pyi

@@ -3,7 +3,7 @@ from datetime import datetime
 from re import Pattern
 from typing import Final, Literal, overload
 
-from openpyxl.cell import _CellValue, _TimeTypes
+from openpyxl.cell import _CellOrMergedCell, _CellValue, _TimeTypes
 from openpyxl.comments.comments import Comment
 from openpyxl.compat.numbers import NUMERIC_TYPES as NUMERIC_TYPES  # cell numeric types
 from openpyxl.styles.cell_style import StyleArray
@@ -75,7 +75,7 @@ class Cell(StyleableObject):
     def hyperlink(self, val: Hyperlink | str | None) -> None: ...
     @property
     def is_date(self) -> bool: ...
-    def offset(self, row: int = 0, column: int = 0) -> Cell: ...
+    def offset(self, row: int = 0, column: int = 0) -> _CellOrMergedCell: ...
     @property
     def comment(self) -> Comment | None: ...
     @comment.setter

package/dist/typeshed-fallback/stubs/openpyxl/openpyxl/comments/comment_sheet.pyi

@@ -3,6 +3,7 @@ from collections.abc import Generator
 from typing import ClassVar, Literal, overload
 from typing_extensions import TypeAlias
 
+from openpyxl.cell import _CellOrMergedCell
 from openpyxl.cell.text import Text
 from openpyxl.comments.author import AuthorList
 from openpyxl.comments.comments import Comment
@@ -101,7 +102,7 @@ class CommentRecord(Serialisable):
         width: int = 144,
     ) -> None: ...
     @classmethod
-    def from_cell(cls, cell): ...
+    def from_cell(cls, cell: _CellOrMergedCell): ...
     @property
     def content(self) -> str: ...
 

package/dist/typeshed-fallback/stubs/openpyxl/openpyxl/workbook/workbook.pyi

@@ -5,7 +5,7 @@ from typing import Any, Final, type_check_only
 from typing_extensions import TypeAlias, deprecated
 from zipfile import ZipFile
 
-from openpyxl import _Decodable, _ZipFileFileProtocol
+from openpyxl import _Decodable, _ZipFileFileWriteProtocol
 from openpyxl.chartsheet.chartsheet import Chartsheet
 from openpyxl.styles.named_styles import NamedStyle
 from openpyxl.utils.indexed_list import IndexedList
@@ -112,7 +112,7 @@ class Workbook:
     def named_styles(self) -> list[str]: ...
     @property
     def mime_type(self) -> str: ...
-    def save(self, filename: _ZipFileFileProtocol) -> None: ...
+    def save(self, filename: _ZipFileFileWriteProtocol) -> None: ...
     @property
     def style_names(self) -> list[str]: ...
     # A write_only and read_only workbooks can't use this method as it requires both reading and writing.

package/dist/typeshed-fallback/stubs/openpyxl/openpyxl/worksheet/_read_only.pyi

@@ -1,10 +1,8 @@
 from _typeshed import SupportsGetItem
-from collections.abc import Generator, Iterator
-from typing import Any, overload
+from collections.abc import Generator
 
 from openpyxl import _VisibilityType
-from openpyxl.cell import _CellValue
-from openpyxl.cell.cell import Cell
+from openpyxl.cell import _CellOrMergedCell, _CellValue
 from openpyxl.utils.cell import _RangeBoundariesTuple
 from openpyxl.workbook.workbook import Workbook
 from openpyxl.worksheet.worksheet import Worksheet
@@ -21,16 +19,9 @@ class ReadOnlyWorksheet:
     # Same as Worksheet.rows
     # https://github.com/python/mypy/issues/6700
     @property
-    def rows(self) -> Generator[tuple[Cell, ...], None, None]: ...
-    # From Worksheet.__getitem__
-    @overload
-    def __getitem__(self, key: int) -> tuple[Cell, ...]: ...
-    @overload
-    def __getitem__(self, key: slice) -> tuple[Any, ...]: ...  # tuple[AnyOf[Cell, tuple[Cell, ...]]]
-    @overload
-    def __getitem__(self, key: str) -> Any: ...  # AnyOf[Cell, tuple[Cell, ...], tuple[tuple[Cell, ...], ...]]
-    # From Worksheet.__iter__
-    def __iter__(self) -> Iterator[tuple[Cell, ...]]: ...
+    def rows(self) -> Generator[tuple[_CellOrMergedCell, ...], None, None]: ...
+    __getitem__ = Worksheet.__getitem__
+    __iter__ = Worksheet.__iter__
     parent: Workbook
     title: str
     sheet_state: _VisibilityType

package/dist/typeshed-fallback/stubs/openpyxl/openpyxl/worksheet/_reader.pyi

@@ -4,8 +4,7 @@ from datetime import datetime
 from typing import Final
 from xml.etree.ElementTree import _FileRead
 
-from openpyxl.cell import _AnyCellValue
-from openpyxl.cell.cell import Cell
+from openpyxl.cell import _AnyCellValue, _CellOrMergedCell
 from openpyxl.cell.rich_text import CellRichText
 from openpyxl.descriptors.serialisable import _ChildSerialisableTreeElement, _SerialisableTreeElement
 from openpyxl.formula.translate import Translator
@@ -111,7 +110,7 @@ class WorksheetReader:
     def bind_tables(self) -> None: ...
     def bind_merged_cells(self) -> None: ...
     def bind_hyperlinks(self) -> None: ...
-    def normalize_merged_cell_link(self, coord: str) -> Cell | None: ...
+    def normalize_merged_cell_link(self, coord: str) -> _CellOrMergedCell | None: ...
     def bind_col_dimensions(self) -> None: ...
     def bind_row_dimensions(self) -> None: ...
     def bind_properties(self) -> None: ...

package/dist/typeshed-fallback/stubs/openpyxl/openpyxl/worksheet/_writer.pyi

@@ -1,8 +1,9 @@
 from _typeshed import Incomplete, ReadableBuffer, StrPath, Unused
-from collections.abc import Generator
+from collections.abc import Generator, Iterable
 from typing import Protocol
 from typing_extensions import TypeAlias
 
+from openpyxl.cell import _CellOrMergedCell
 from openpyxl.worksheet._write_only import WriteOnlyWorksheet
 from openpyxl.worksheet.worksheet import Worksheet
 
@@ -30,9 +31,9 @@ class WorksheetWriter:
     def write_views(self) -> None: ...
     def write_cols(self) -> None: ...
     def write_top(self) -> None: ...
-    def rows(self) -> list[tuple[int, list[Incomplete]]]: ...
+    def rows(self) -> list[tuple[int, list[_CellOrMergedCell]]]: ...
     def write_rows(self) -> None: ...
-    def write_row(self, xf, row, row_idx) -> None: ...
+    def write_row(self, xf, row: Iterable[_CellOrMergedCell], row_idx) -> None: ...
     def write_protection(self) -> None: ...
     def write_scenarios(self) -> None: ...
     def write_filter(self) -> None: ...

package/dist/typeshed-fallback/stubs/openpyxl/openpyxl/worksheet/merge.pyi

@@ -1,6 +1,7 @@
 from _typeshed import Incomplete, Unused
 from typing import ClassVar
 
+from openpyxl.cell import _CellOrMergedCell
 from openpyxl.descriptors.serialisable import Serialisable
 from openpyxl.worksheet.worksheet import Worksheet
 
@@ -29,7 +30,7 @@ class MergeCells(Serialisable):
 
 class MergedCellRange(CellRange):
     ws: Worksheet
-    start_cell: Incomplete
+    start_cell: _CellOrMergedCell
     def __init__(self, worksheet: Worksheet, coord) -> None: ...
     def format(self) -> None: ...
     def __contains__(self, coord: str) -> bool: ...

package/dist/typeshed-fallback/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi

@@ -6,7 +6,7 @@ from typing import Any, Final, Literal, NoReturn, overload
 from typing_extensions import deprecated
 
 from openpyxl import _Decodable, _VisibilityType
-from openpyxl.cell import _CellValue
+from openpyxl.cell import _CellOrMergedCell, _CellValue
 from openpyxl.cell.cell import Cell
 from openpyxl.chart._chart import ChartBase
 from openpyxl.drawing.image import Image
@@ -51,6 +51,7 @@ class Worksheet(_WorkbookChild):
     ORIENTATION_PORTRAIT: Final = "portrait"
     ORIENTATION_LANDSCAPE: Final = "landscape"
 
+    _cells: dict[tuple[int, int], _CellOrMergedCell]  # private but very useful to understand typing
     row_dimensions: DimensionHolder[int, RowDimension]
     column_dimensions: DimensionHolder[str, ColumnDimension]
     row_breaks: RowBreak
@@ -85,19 +86,21 @@ class Worksheet(_WorkbookChild):
     @property
     def freeze_panes(self) -> str | None: ...
     @freeze_panes.setter
-    def freeze_panes(self, topLeftCell: str | Cell | None = ...) -> None: ...
-    def cell(self, row: int, column: int, value: _CellValue | None = None) -> Cell: ...
+    def freeze_panes(self, topLeftCell: str | Cell | None = None) -> None: ...
+    def cell(self, row: int, column: int, value: _CellValue | None = None) -> _CellOrMergedCell: ...
     # An int is necessarily a row selection
     @overload
-    def __getitem__(self, key: int) -> tuple[Cell, ...]: ...
+    def __getitem__(self, key: int) -> tuple[_CellOrMergedCell, ...]: ...
     # A slice is necessarily a row or rows, even if targetting a single cell
     @overload
-    def __getitem__(self, key: slice) -> tuple[Any, ...]: ...  # tuple[AnyOf[Cell, tuple[Cell, ...]]]
+    def __getitem__(self, key: slice) -> tuple[Any, ...]: ...  # tuple[AnyOf[_CellOrMergedCell, tuple[_CellOrMergedCell, ...]]]
     # A str could be an individual cell, row, column or full range
     @overload
-    def __getitem__(self, key: str) -> Any: ...  # AnyOf[Cell, tuple[Cell, ...], tuple[tuple[Cell, ...], ...]]
+    def __getitem__(
+        self, key: str
+    ) -> Any: ...  # AnyOf[_CellOrMergedCell, tuple[_CellOrMergedCell, ...], tuple[tuple[_CellOrMergedCell, ...], ...]]
     def __setitem__(self, key: str, value: _CellValue) -> None: ...
-    def __iter__(self) -> Iterator[tuple[Cell, ...]]: ...
+    def __iter__(self) -> Iterator[tuple[_CellOrMergedCell, ...]]: ...
     def __delitem__(self, key: str) -> None: ...
     @property
     def min_row(self) -> int: ...
@@ -132,11 +135,13 @@ class Worksheet(_WorkbookChild):
         min_col: int | None = None,
         max_col: int | None = None,
         values_only: Literal[False] = False,
-    ) -> Generator[tuple[Cell, ...], None, None]: ...
+    ) -> Generator[tuple[_CellOrMergedCell, ...], None, None]: ...
     @overload
     def iter_rows(
         self, min_row: int | None, max_row: int | None, min_col: int | None, max_col: int | None, values_only: bool
-    ) -> Generator[tuple[Cell, ...], None, None] | Generator[tuple[str | float | datetime | None, ...], None, None]: ...
+    ) -> (
+        Generator[tuple[_CellOrMergedCell, ...], None, None] | Generator[tuple[str | float | datetime | None, ...], None, None]
+    ): ...
     @overload
     def iter_rows(
         self,
@@ -146,9 +151,11 @@ class Worksheet(_WorkbookChild):
         max_col: int | None = None,
         *,
         values_only: bool,
-    ) -> Generator[tuple[Cell, ...], None, None] | Generator[tuple[str | float | datetime | None, ...], None, None]: ...
+    ) -> (
+        Generator[tuple[_CellOrMergedCell, ...], None, None] | Generator[tuple[str | float | datetime | None, ...], None, None]
+    ): ...
     @property
-    def rows(self) -> Generator[tuple[Cell, ...], None, None]: ...
+    def rows(self) -> Generator[tuple[_CellOrMergedCell, ...], None, None]: ...
     @property
     def values(self) -> Generator[tuple[_CellValue | None, ...]]: ...
     @overload
@@ -173,11 +180,13 @@ class Worksheet(_WorkbookChild):
         min_row: int | None = None,
         max_row: int | None = None,
         values_only: Literal[False] = False,
-    ) -> Generator[tuple[Cell, ...], None, None]: ...
+    ) -> Generator[tuple[_CellOrMergedCell, ...], None, None]: ...
     @overload
     def iter_cols(
         self, min_col: int | None, max_col: int | None, min_row: int | None, max_row: int | None, values_only: bool
-    ) -> Generator[tuple[Cell, ...], None, None] | Generator[tuple[str | float | datetime | None, ...], None, None]: ...
+    ) -> (
+        Generator[tuple[_CellOrMergedCell, ...], None, None] | Generator[tuple[str | float | datetime | None, ...], None, None]
+    ): ...
     @overload
     def iter_cols(
         self,
@@ -187,9 +196,11 @@ class Worksheet(_WorkbookChild):
         max_row: int | None = None,
         *,
         values_only: bool,
-    ) -> Generator[tuple[Cell, ...], None, None] | Generator[tuple[str | float | datetime | None, ...], None, None]: ...
+    ) -> (
+        Generator[tuple[_CellOrMergedCell, ...], None, None] | Generator[tuple[str | float | datetime | None, ...], None, None]
+    ): ...
     @property
-    def columns(self) -> Generator[tuple[Cell, ...], None, None]: ...
+    def columns(self) -> Generator[tuple[_CellOrMergedCell, ...], None, None]: ...
     @property
     def column_groups(self) -> list[str]: ...
     def set_printer_settings(
@@ -241,11 +252,11 @@ class Worksheet(_WorkbookChild):
     def append(
         self,
         iterable: (
-            list[Incomplete]
-            | tuple[Incomplete, ...]
+            list[Any]  # lists are invariant, but any subtype or union will do
+            | tuple[_CellOrMergedCell | str | float | datetime | None, ...]
             | range
-            | GeneratorType[Incomplete, object, object]
-            | dict[int | str, Incomplete]
+            | GeneratorType[_CellOrMergedCell | str | float | datetime | None, object, object]
+            | dict[int | str, str | float | datetime | None]
         ),
     ) -> None: ...
     def insert_rows(self, idx: int, amount: int = 1) -> None: ...

package/dist/typeshed-fallback/stubs/peewee/METADATA.toml

@@ -1,4 +1,4 @@
-version = "3.17.7"
+version = "3.17.8"
 upstream_repository = "https://github.com/coleifer/peewee"
 # We're not providing stubs for all playhouse modules right now
 # https://github.com/python/typeshed/pull/11731#issuecomment-2065729058

package/dist/typeshed-fallback/stubs/peewee/peewee.pyi

@@ -1674,7 +1674,9 @@ class Model(metaclass=ModelBase):
     def is_dirty(self) -> bool: ...
     @property
     def dirty_fields(self): ...
-    def dependencies(self, search_nullable: bool = ...) -> Generator[Incomplete, None, None]: ...
+    def dependencies(
+        self, search_nullable: bool = True, exclude_null_children: bool = False
+    ) -> Generator[Incomplete, None, None]: ...
     def delete_instance(self, recursive: bool = ..., delete_nullable: bool = ...): ...
     def __hash__(self) -> int: ...
     def __eq__(self, other) -> Expression | bool: ...  # type: ignore[override]

package/dist/typeshed-fallback/stubs/pynput/pynput/_util.pyi

@@ -1,5 +1,5 @@
-import sys
 import threading
+from _typeshed import OptExcInfo
 from collections.abc import Callable
 from queue import Queue
 from types import ModuleType, TracebackType
@@ -28,7 +28,7 @@ class AbstractListener(threading.Thread):
     _thread: threading.Thread  # undocumented
     _condition: threading.Condition  # undocumented
     _ready: bool  # undocumented
-    _queue: Queue[sys._OptExcInfo | None]  # undocumented
+    _queue: Queue[OptExcInfo | None]  # undocumented
     daemon: bool
     def __init__(self, suppress: bool = False, **kwargs: Callable[..., bool | None] | None) -> None: ...
     @property

package/dist/typeshed-fallback/stubs/pysftp/pysftp/__init__.pyi

@@ -25,7 +25,7 @@ from pysftp.helpers import (
 )
 
 class CnOpts:
-    log: bool
+    log: bool | str
     compression: bool
     ciphers: Sequence[str] | None
     hostkeys: paramiko.HostKeys | None
@@ -45,7 +45,7 @@ class Connection:
         port: int = 22,
         private_key_pass: str | None = None,
         ciphers: Sequence[str] | None = None,
-        log: bool = False,
+        log: bool | str = False,
         cnopts: CnOpts | None = None,
         default_path: _Path | None = None,
     ) -> None: ...