Merge branch 'main' into hotfix/yw/799-to-dict

Author: cmp0xff

pandas-stubs/__init__.pyi

@@ -119,7 +119,6 @@ from pandas.io.api import (
     read_stata as read_stata,
     read_table as read_table,
     read_xml as read_xml,
-    to_pickle as to_pickle,
 )
 from pandas.io.json._normalize import json_normalize as json_normalize
 from pandas.tseries import offsets as offsets

pandas-stubs/_libs/lib.pyi

@@ -16,10 +16,10 @@ class _NoDefault(Enum):
 no_default: Final = _NoDefault.no_default
 _NoDefaultDoNotUse: TypeAlias = Literal[_NoDefault.no_default]  # noqa: PYI047
 
-def infer_dtype(value: object, skipna: bool = ...) -> str: ...
+def infer_dtype(value: object, skipna: bool = True) -> str: ...
 def is_iterator(obj: object) -> bool: ...
 def is_scalar(val: object) -> bool: ...
-def is_list_like(obj: object, allow_sets: bool = ...) -> bool: ...
+def is_list_like(obj: object, allow_sets: bool = True) -> bool: ...
 def is_complex(val: object) -> TypeGuard[complex]: ...
 def is_bool(val: object) -> TypeGuard[bool | np.bool_]: ...
 def is_integer(val: object) -> TypeGuard[int | np.integer]: ...

pandas-stubs/_libs/tslibs/nattype.pyi

@@ -74,34 +74,34 @@ class NaTType:
     def weekday(self) -> float: ...
     def isoweekday(self) -> float: ...
     def total_seconds(self) -> float: ...
-    def today(self, tz: _tzinfo | str | None = ...) -> NaTType: ...
-    def now(self, tz: _tzinfo | str | None = ...) -> NaTType: ...
+    def today(self, tz: _tzinfo | str | None = None) -> NaTType: ...
+    def now(self, tz: _tzinfo | str | None = None) -> NaTType: ...
     def to_pydatetime(self) -> NaTType: ...
     def date(self) -> NaTType: ...
     def round(
         self,
         freq: Frequency,
-        ambiguous: bool | Literal["raise"] | NaTType = ...,
-        nonexistent: TimestampNonexistent = ...,
+        ambiguous: bool | Literal["raise"] | NaTType = "raise",
+        nonexistent: TimestampNonexistent = "raise",
     ) -> NaTType: ...
     def floor(
         self,
         freq: Frequency,
-        ambiguous: bool | Literal["raise"] | NaTType = ...,
-        nonexistent: TimestampNonexistent = ...,
+        ambiguous: bool | Literal["raise"] | NaTType = "raise",
+        nonexistent: TimestampNonexistent = "raise",
     ) -> NaTType: ...
     def ceil(
         self,
         freq: Frequency,
-        ambiguous: bool | Literal["raise"] | NaTType = ...,
-        nonexistent: TimestampNonexistent = ...,
+        ambiguous: bool | Literal["raise"] | NaTType = "raise",
+        nonexistent: TimestampNonexistent = "raise",
     ) -> NaTType: ...
     def tz_convert(self) -> NaTType: ...
     def tz_localize(
         self,
         tz: _tzinfo | str | None,
-        ambiguous: bool | Literal["raise"] | NaTType = ...,
-        nonexistent: TimestampNonexistent = ...,
+        ambiguous: bool | Literal["raise"] | NaTType = "raise",
+        nonexistent: TimestampNonexistent = "raise",
     ) -> NaTType: ...
     def replace(
         self,
@@ -154,4 +154,4 @@ class NaTType:
     __ge__: _NatComparison
     @property
     def unit(self) -> TimeUnit: ...
-    def as_unit(self, unit: TimeUnit, round_ok: bool = ...) -> Self: ...
+    def as_unit(self, unit: TimeUnit, round_ok: bool = True) -> Self: ...

pandas-stubs/_libs/tslibs/period.pyi

@@ -197,12 +197,12 @@ class Period(PeriodMixin):
     def day_of_year(self) -> int: ...
     @property
     def day_of_week(self) -> int: ...
-    def asfreq(self, freq: str | BaseOffset, how: _PeriodFreqHow = ...) -> Period: ...
+    def asfreq(self, freq: str | BaseOffset, how: _PeriodFreqHow = "end") -> Period: ...
     @classmethod
     def now(cls, freq: str | BaseOffset = ...) -> Period: ...
     def strftime(self, fmt: str) -> str: ...
     def to_timestamp(
         self,
         freq: str | BaseOffset | None = ...,
-        how: _PeriodToTimestampHow = ...,
+        how: _PeriodToTimestampHow = "S",
     ) -> Timestamp: ...

pandas-stubs/_libs/tslibs/timedeltas.pyi

@@ -388,4 +388,4 @@ class Timedelta(timedelta):
     def view(self, dtype: npt.DTypeLike = ...) -> object: ...
     @property
     def unit(self) -> TimeUnit: ...
-    def as_unit(self, unit: TimeUnit, round_ok: bool = ...) -> Self: ...
+    def as_unit(self, unit: TimeUnit, round_ok: bool = True) -> Self: ...

pandas-stubs/_libs/tslibs/timestamps.pyi

@@ -115,15 +115,15 @@ class Timestamp(datetime, SupportsIndex):
     @classmethod
     def utcfromtimestamp(cls, ts: float) -> Self: ...
     @classmethod
-    def today(cls, tz: _tzinfo | str | None = ...) -> Self: ...
+    def today(cls, tz: _tzinfo | str | None = None) -> Self: ...
     @classmethod
     def fromordinal(
         cls,
         ordinal: int,
         tz: _tzinfo | str | None = ...,
     ) -> Self: ...
     @classmethod
-    def now(cls, tz: _tzinfo | str | None = ...) -> Self: ...
+    def now(cls, tz: _tzinfo | str | None = None) -> Self: ...
     @classmethod
     def utcnow(cls) -> Self: ...
     # error: Signature of "combine" incompatible with supertype "datetime"
@@ -157,7 +157,19 @@ class Timestamp(datetime, SupportsIndex):
     ) -> Timestamp: ...
     def astimezone(self, tz: _tzinfo | None = ...) -> Self: ...
     def ctime(self) -> str: ...
-    def isoformat(self, sep: str = ..., timespec: str = ...) -> str: ...
+    def isoformat(  # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
+        self,
+        sep: str = "T",
+        timespec: Literal[
+            "auto",
+            "hours",
+            "minutes",
+            "seconds",
+            "milliseconds",
+            "microseconds",
+            "nanoseconds",
+        ] = "auto",
+    ) -> str: ...
     @classmethod
     def strptime(cls, date_string: Never, format: Never) -> Never: ...  # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
     def utcoffset(self) -> timedelta | None: ...
@@ -276,31 +288,31 @@ class Timestamp(datetime, SupportsIndex):
     def tz_localize(
         self,
         tz: TimeZones,
-        ambiguous: _Ambiguous = ...,
-        nonexistent: TimestampNonexistent = ...,
+        ambiguous: _Ambiguous = "raise",
+        nonexistent: TimestampNonexistent = "raise",
     ) -> Self: ...
     def normalize(self) -> Self: ...
     # TODO: round/floor/ceil could return NaT?
     def round(
         self,
         freq: str,
-        ambiguous: _Ambiguous = ...,
-        nonexistent: TimestampNonexistent = ...,
+        ambiguous: _Ambiguous = "raise",
+        nonexistent: TimestampNonexistent = "raise",
     ) -> Self: ...
     def floor(
         self,
         freq: str,
-        ambiguous: _Ambiguous = ...,
-        nonexistent: TimestampNonexistent = ...,
+        ambiguous: _Ambiguous = "raise",
+        nonexistent: TimestampNonexistent = "raise",
     ) -> Self: ...
     def ceil(
         self,
         freq: str,
-        ambiguous: _Ambiguous = ...,
-        nonexistent: TimestampNonexistent = ...,
+        ambiguous: _Ambiguous = "raise",
+        nonexistent: TimestampNonexistent = "raise",
     ) -> Self: ...
-    def day_name(self, locale: str | None = ...) -> str: ...
-    def month_name(self, locale: str | None = ...) -> str: ...
+    def day_name(self, locale: str | None = None) -> str: ...
+    def month_name(self, locale: str | None = None) -> str: ...
     @property
     def day_of_week(self) -> int: ...
     @property
@@ -322,6 +334,6 @@ class Timestamp(datetime, SupportsIndex):
     def daysinmonth(self) -> int: ...
     @property
     def unit(self) -> TimeUnit: ...
-    def as_unit(self, unit: TimeUnit, round_ok: bool = ...) -> Self: ...
+    def as_unit(self, unit: TimeUnit, round_ok: bool = True) -> Self: ...
     # To support slicing
     def __index__(self) -> int: ...

pandas-stubs/_testing/__init__.pyi

@@ -5,7 +5,6 @@ from collections.abc import (
 )
 from contextlib import contextmanager
 from typing import (
-    Any,
     Literal,
     overload,
 )
@@ -36,29 +35,29 @@ from pandas._typing import (
 def assert_almost_equal(
     left: T,
     right: T,
-    check_dtype: bool | Literal["equiv"] = ...,
-    rtol: float = ...,
-    atol: float = ...,
+    check_dtype: bool | Literal["equiv"] = "equiv",
+    rtol: float = 1e-5,
+    atol: float = 1e-8,
     **kwargs,
 ) -> None: ...
-def assert_dict_equal(left: dict, right: dict, compare_keys: bool = ...) -> None: ...
+def assert_dict_equal(left: dict, right: dict, compare_keys: bool = True) -> None: ...
 def assert_index_equal(
     left: Index,
     right: Index,
-    exact: bool | Literal["equiv"] = ...,
-    check_names: bool = ...,
-    check_exact: bool = ...,
-    check_categorical: bool = ...,
-    check_order: bool = ...,
-    rtol: float = ...,
-    atol: float = ...,
-    obj: str = ...,
+    exact: bool | Literal["equiv"] = "equiv",
+    check_names: bool = True,
+    check_exact: bool = True,
+    check_categorical: bool = True,
+    check_order: bool = True,
+    rtol: float = 1e-5,
+    atol: float = 1e-8,
+    obj: str = "Index",
 ) -> None: ...
 def assert_class_equal(
-    left: T, right: T, exact: bool | Literal["equiv"] = ..., obj: str = ...
+    left: T, right: T, exact: bool | Literal["equiv"] = True, obj: str = "Input"
 ) -> None: ...
 def assert_attr_equal(
-    attr: str, left: object, right: object, obj: str = ...
+    attr: str, left: object, right: object, obj: str = "Attributes"
 ) -> None: ...
 def assert_is_valid_plot_return_object(
     objs: Series | np.ndarray | Artist | tuple | dict,
@@ -67,44 +66,50 @@ def assert_is_sorted(seq: AnyArrayLike) -> None: ...
 def assert_categorical_equal(
     left: Categorical,
     right: Categorical,
-    check_dtype: bool = ...,
-    check_category_order: bool = ...,
-    obj: str = ...,
+    check_dtype: bool = True,
+    check_category_order: bool = True,
+    obj: str = "Categorical",
 ) -> None: ...
 def assert_interval_array_equal(
     left: IntervalArray,
     right: IntervalArray,
-    exact: bool | Literal["equiv"] = ...,
-    obj: str = ...,
+    exact: bool | Literal["equiv"] = "equiv",
+    obj: str = "IntervalArray",
 ) -> None: ...
 def assert_period_array_equal(
-    left: PeriodArray, right: PeriodArray, obj: str = ...
+    left: PeriodArray, right: PeriodArray, obj: str = "PeriodArray"
 ) -> None: ...
 def assert_datetime_array_equal(
-    left: DatetimeArray, right: DatetimeArray, check_freq: bool = ...
+    left: DatetimeArray,
+    right: DatetimeArray,
+    obj: str = "DatetimeArray",
+    check_freq: bool = True,
 ) -> None: ...
 def assert_timedelta_array_equal(
-    left: TimedeltaArray, right: TimedeltaArray, check_freq: bool = ...
+    left: TimedeltaArray,
+    right: TimedeltaArray,
+    obj: str = "TimedeltaArray",
+    check_freq: bool = True,
 ) -> None: ...
 def assert_numpy_array_equal(
     left,
     right,
-    strict_nan: bool = ...,
-    check_dtype: bool | Literal["equiv"] = ...,
-    err_msg: str | None = ...,
-    check_same: Literal["copy", "same"] | None = ...,
-    obj: str = ...,
-    index_values: Index | np.ndarray | None = ...,
+    strict_nan: bool = False,
+    check_dtype: bool | Literal["equiv"] = True,
+    err_msg: str | None = None,
+    check_same: Literal["copy", "same"] | None = None,
+    obj: str = "numpy array",
+    index_values: Index | np.ndarray | None = None,
 ) -> None: ...
 def assert_extension_array_equal(
     left: ExtensionArray,
     right: ExtensionArray,
-    check_dtype: bool | Literal["equiv"] = ...,
-    index_values: Index | np.ndarray | None = ...,
-    check_exact: bool = ...,
-    rtol: float = ...,
-    atol: float = ...,
-    obj: str = ...,
+    check_dtype: bool | Literal["equiv"] = True,
+    index_values: Index | np.ndarray | None = None,
+    check_exact: bool = False,
+    rtol: float = 1e-5,
+    atol: float = 1e-8,
+    obj: str = "ExtensionArray",
 ) -> None: ...
 @overload
 def assert_series_equal(
@@ -151,21 +156,21 @@ def assert_series_equal(
 def assert_frame_equal(
     left: DataFrame,
     right: DataFrame,
-    check_dtype: bool | Literal["equiv"] = ...,
-    check_index_type: bool | Literal["equiv"] = ...,
-    check_column_type: bool | Literal["equiv"] = ...,
-    check_frame_type: bool = ...,
-    check_names: bool = ...,
-    by_blocks: bool = ...,
-    check_exact: bool = ...,
-    check_datetimelike_compat: bool = ...,
-    check_categorical: bool = ...,
-    check_like: bool = ...,
-    check_freq: bool = ...,
-    check_flags: bool = ...,
-    rtol: float = ...,
-    atol: float = ...,
-    obj: str = ...,
+    check_dtype: bool | Literal["equiv"] = True,
+    check_index_type: bool | Literal["equiv"] = "equiv",
+    check_column_type: bool | Literal["equiv"] = "equiv",
+    check_frame_type: bool = True,
+    check_names: bool = True,
+    by_blocks: bool = False,
+    check_exact: bool = False,
+    check_datetimelike_compat: bool = False,
+    check_categorical: bool = True,
+    check_like: bool = False,
+    check_freq: bool = True,
+    check_flags: bool = True,
+    rtol: float = 1e-5,
+    atol: float = 1e-8,
+    obj: str = "DataFrame",
 ) -> None: ...
 def assert_equal(left, right, **kwargs) -> None: ...
 def assert_sp_array_equal(left: SparseArray, right: SparseArray) -> None: ...
@@ -178,12 +183,10 @@ def assert_produces_warning(
     ) = ...,
     filter_level: Literal[
         "error", "ignore", "always", "default", "module", "once"
-    ] = ...,
-    check_stacklevel: bool = ...,
-    raise_on_extra_warnings: bool = ...,
+    ] = "always",
+    check_stacklevel: bool = True,
+    raise_on_extra_warnings: bool = True,
     match: str | None = None,
 ) -> Generator[list[warnings.WarningMessage], None, None]: ...
 @contextmanager
-def ensure_clean(
-    filename: str | None = ..., return_filelike: bool = ..., **kwargs: Any
-) -> Generator[str, None, None]: ...
+def ensure_clean(filename: str | None = None) -> Generator[str, None, None]: ...

pandas-stubs/_typing.pyi

@@ -847,6 +847,26 @@ S1 = TypeVar("S1", bound=SeriesDType, default=Any)
 S2 = TypeVar("S2", bound=SeriesDType)
 S3 = TypeVar("S3", bound=SeriesDType)
 
+# Constraint, instead of bound
+C2 = TypeVar(
+    "C2",
+    str,
+    bytes,
+    datetime.date,
+    datetime.time,
+    bool,
+    int,
+    float,
+    complex,
+    Dtype,
+    datetime.datetime,  # includes pd.Timestamp
+    datetime.timedelta,  # includes pd.Timedelta
+    Period,
+    Interval,
+    CategoricalDtype,
+    BaseOffset,
+)
+
 IndexingInt: TypeAlias = (
     int | np.int_ | np.integer | np.unsignedinteger | np.signedinteger | np.int8
 )