Merge remote-tracking branch 'upstream/main' into typevar-default

Author: MarcoGorelli

pandas-stubs/core/generic.pyi

@@ -19,9 +19,7 @@ import numpy as np
 from pandas import Index
 import pandas.core.indexing as indexing
 from pandas.core.resample import DatetimeIndexResampler
-from pandas.core.series import (
-    Series,
-)
+from pandas.core.series import Series
 import sqlalchemy.engine
 from typing_extensions import (
     Concatenate,

tests/test_scalars.py

@@ -1376,6 +1376,8 @@ def test_timestamp_cmp() -> None:
         assert_type(ts != c_datetimeindex, np_ndarray_bool), np.ndarray, np.bool_
     )
     assert (eq_arr != ne_arr).all()
+    assert_type(ts, pd.Timestamp)
+    assert_type(c_unknown_index, pd.Index)
     eq_arr = check(
         assert_type(ts == c_unknown_index, np_ndarray_bool), np.ndarray, np.bool_
     )