diff --git a/tests/test_dtypes.py b/tests/test_dtypes.py index 4be3994a5..cf6e335b6 100644 --- a/tests/test_dtypes.py +++ b/tests/test_dtypes.py @@ -113,7 +113,7 @@ def test_categorical_dtype() -> None: pd.CategoricalDtype, ) check(assert_type(cdt.categories, pd.Index), pd.Index) - assert check(assert_type(cdt.ordered, Optional[bool]), bool) + check(assert_type(cdt.ordered, Optional[bool]), bool) def test_sparse_dtype() -> None: diff --git a/tests/test_frame.py b/tests/test_frame.py index b9390f2bb..b43e817b4 100644 --- a/tests/test_frame.py +++ b/tests/test_frame.py @@ -463,7 +463,7 @@ def test_types_drop() -> None: check(assert_type(df.drop(index=[0]), pd.DataFrame), pd.DataFrame) check(assert_type(df.drop(index=1), pd.DataFrame), pd.DataFrame) check(assert_type(df.drop(labels=0), pd.DataFrame), pd.DataFrame) - assert assert_type(df.drop([0, 0], inplace=True), None) is None + check(assert_type(df.drop([0, 0], inplace=True), None), type(None)) to_drop: list[str] = ["col1"] check(assert_type(df.drop(columns=to_drop), pd.DataFrame), pd.DataFrame) # GH 302 @@ -2968,8 +2968,8 @@ def test_types_ffill() -> None: assert_type(df.ffill(inplace=False, limit_area="inside"), pd.DataFrame), pd.DataFrame, ) - assert assert_type(df.ffill(inplace=True), None) is None - assert assert_type(df.ffill(inplace=True, limit_area="outside"), None) is None + check(assert_type(df.ffill(inplace=True), None), type(None)) + check(assert_type(df.ffill(inplace=True, limit_area="outside"), None), type(None)) def test_types_bfill() -> None: @@ -2981,8 +2981,8 @@ def test_types_bfill() -> None: assert_type(df.bfill(inplace=False, limit_area="inside"), pd.DataFrame), pd.DataFrame, ) - assert assert_type(df.bfill(inplace=True), None) is None - assert assert_type(df.bfill(inplace=True, limit_area="outside"), None) is None + check(assert_type(df.bfill(inplace=True), None), type(None)) + check(assert_type(df.bfill(inplace=True, limit_area="outside"), None), type(None)) def test_types_replace() -> None: @@ -2990,7 +2990,7 @@ def test_types_replace() -> None: df = pd.DataFrame([[1, 2, 3]]) check(assert_type(df.replace(1, 2), pd.DataFrame), pd.DataFrame) check(assert_type(df.replace(1, 2, inplace=False), pd.DataFrame), pd.DataFrame) - assert assert_type(df.replace(1, 2, inplace=True), None) is None + check(assert_type(df.replace(1, 2, inplace=True), None), type(None)) def test_dataframe_replace() -> None: @@ -3286,12 +3286,12 @@ def test_frame_ndarray_assignmment() -> None: def test_not_hashable() -> None: # GH 113 - assert assert_type(pd.DataFrame.__hash__, None) is None - assert assert_type(pd.DataFrame().__hash__, None) is None - assert assert_type(pd.Series.__hash__, None) is None - assert assert_type(pd.Series([], dtype=object).__hash__, None) is None - assert assert_type(pd.Index.__hash__, None) is None - assert assert_type(pd.Index([]).__hash__, None) is None + check(assert_type(pd.DataFrame.__hash__, None), type(None)) + check(assert_type(pd.DataFrame().__hash__, None), type(None)) + check(assert_type(pd.Series.__hash__, None), type(None)) + check(assert_type(pd.Series([], dtype=object).__hash__, None), type(None)) + check(assert_type(pd.Index.__hash__, None), type(None)) + check(assert_type(pd.Index([]).__hash__, None), type(None)) def test_func(_: Hashable): pass @@ -4171,9 +4171,11 @@ def test_insert_newvalues() -> None: df = pd.DataFrame({"a": [1, 2]}) ab = pd.DataFrame({"col1": [1, 2], "col2": [3, 4]}) ef = pd.DataFrame({"z": [4, 5, 6]}) - assert assert_type(df.insert(loc=0, column="b", value=None), None) is None - assert assert_type(ab.insert(loc=0, column="newcol", value=[99, 99]), None) is None - assert assert_type(ef.insert(loc=0, column="g", value=4), None) is None + check(assert_type(df.insert(loc=0, column="b", value=None), None), type(None)) + check( + assert_type(ab.insert(loc=0, column="newcol", value=[99, 99]), None), type(None) + ) + check(assert_type(ef.insert(loc=0, column="g", value=4), None), type(None)) def test_astype() -> None: diff --git a/tests/test_timefuncs.py b/tests/test_timefuncs.py index 7e74fa8fd..95d22f8e1 100644 --- a/tests/test_timefuncs.py +++ b/tests/test_timefuncs.py @@ -190,7 +190,7 @@ def test_timedelta_series_string() -> None: def test_timestamp_timedelta_series_arithmetic() -> None: ts1 = pd.to_datetime(pd.Series(["2022-03-05", "2022-03-06"])) - assert isinstance(ts1.iloc[0], pd.Timestamp) + check(assert_type(ts1.iloc[0], pd.Timestamp), pd.Timestamp) td1 = pd.to_timedelta([2, 3], "seconds") ts2 = pd.to_datetime(pd.Series(["2022-03-08", "2022-03-10"])) r1 = ts1 - ts2 @@ -328,7 +328,7 @@ def test_timedelta_series_sum() -> None: def test_iso_calendar() -> None: # GH 31 dates = pd.date_range(start="2012-01-01", end="2019-12-31", freq="W-MON") - dates.isocalendar() + check(assert_type(dates.isocalendar(), pd.DataFrame), pd.DataFrame) def test_fail_on_adding_two_timestamps() -> None: @@ -343,7 +343,7 @@ def test_fail_on_adding_two_timestamps() -> None: def test_dtindex_tzinfo() -> None: # GH 71 dti = pd.date_range("2000-1-1", periods=10) - assert assert_type(dti.tzinfo, Optional[dt.tzinfo]) is None + check(assert_type(dti.tzinfo, Optional[dt.tzinfo]), type(None)) def test_todatetime_fromnumpy() -> None: @@ -422,7 +422,7 @@ def test_series_dt_accessors() -> None: check(assert_type(s0.dt.is_leap_year, "pd.Series[bool]"), pd.Series, np.bool_) check(assert_type(s0.dt.daysinmonth, "pd.Series[int]"), pd.Series, np.integer) check(assert_type(s0.dt.days_in_month, "pd.Series[int]"), pd.Series, np.integer) - assert assert_type(s0.dt.tz, Optional[dt.tzinfo]) is None + check(assert_type(s0.dt.tz, Optional[dt.tzinfo]), type(None)) check(assert_type(s0.dt.freq, Optional[str]), str) check(assert_type(s0.dt.isocalendar(), pd.DataFrame), pd.DataFrame) check(assert_type(s0.dt.to_period("D"), "PeriodSeries"), pd.Series, pd.Period) @@ -1207,19 +1207,61 @@ def test_to_timedelta_index() -> None: def test_bdate_range_holidays() -> None: - pd.bdate_range("2000-1-1", "2001-1-1", freq="C", holidays=["2000-12-15"]) - pd.bdate_range("2000-1-1", "2001-1-1", freq="C", holidays=[dt.date(2000, 12, 15)]) - pd.bdate_range( - "2000-1-1", "2001-1-1", freq="C", holidays=[pd.Timestamp(2000, 12, 15)] + check( + assert_type( + pd.bdate_range("2000-1-1", "2001-1-1", freq="C", holidays=["2000-12-15"]), + pd.DatetimeIndex, + ), + pd.DatetimeIndex, + ) + check( + assert_type( + pd.bdate_range( + "2000-1-1", "2001-1-1", freq="C", holidays=[dt.date(2000, 12, 15)] + ), + pd.DatetimeIndex, + ), + pd.DatetimeIndex, + ) + check( + assert_type( + pd.bdate_range( + "2000-1-1", "2001-1-1", freq="C", holidays=[pd.Timestamp(2000, 12, 15)] + ), + pd.DatetimeIndex, + ), + pd.DatetimeIndex, ) - pd.bdate_range( - "2000-1-1", "2001-1-1", freq="C", holidays=[np.datetime64("2000-12-15")] + check( + assert_type( + pd.bdate_range( + "2000-1-1", "2001-1-1", freq="C", holidays=[np.datetime64("2000-12-15")] + ), + pd.DatetimeIndex, + ), + pd.DatetimeIndex, ) - pd.bdate_range( - "2000-1-1", "2001-1-1", freq="C", holidays=[dt.datetime(2000, 12, 15)] + check( + assert_type( + pd.bdate_range( + "2000-1-1", "2001-1-1", freq="C", holidays=[dt.datetime(2000, 12, 15)] + ), + pd.DatetimeIndex, + ), + pd.DatetimeIndex, ) - pd.bdate_range( - "2000-1-1", "2001-1-1", freq="C", holidays=[dt.date(2000, 12, 15)], name=("a",) + check( + assert_type( + pd.bdate_range( + "2000-1-1", + "2001-1-1", + freq="C", + holidays=[dt.date(2000, 12, 15)], + name=("a",), + ), + pd.DatetimeIndex, + ), + pd.DatetimeIndex, ) diff --git a/tests/test_windowing.py b/tests/test_windowing.py index df64b8d85..c8b041ce5 100644 --- a/tests/test_windowing.py +++ b/tests/test_windowing.py @@ -14,6 +14,8 @@ ) from typing_extensions import assert_type +from pandas._libs.tslibs.offsets import DateOffset + from tests import ( PD_LTE_23, check, @@ -56,7 +58,7 @@ def test_rolling_basic_math() -> None: def test_rolling_datetime_index() -> None: offset_1d = to_offset("1D") - assert offset_1d is not None + check(assert_type(offset_1d, DateOffset), DateOffset) check(assert_type(DF_DTI.rolling("1D"), "Rolling[DataFrame]"), Rolling, DataFrame) check(