Skip to content

Commit ea854e8

Browse files
committed
unquote pd.Series in tests
1 parent 58050bc commit ea854e8

File tree

3 files changed

+26
-28
lines changed

3 files changed

+26
-28
lines changed

pandas-stubs/core/reshape/concat.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def concat(
126126
) -> DataFrame: ...
127127

128128
# Including either of the next 2 overloads causes mypy to complain about
129-
# test_pandas.py:test_types_concat() in assert_type(pd.concat([s, s2]), "pd.Series")
129+
# test_pandas.py:test_types_concat() in assert_type(pd.concat([s, s2]), pd.Series)
130130
# It thinks that pd.concat([s, s2]) is Any . May be due to Series being
131131
# Generic, or the axis argument being unspecified, and then there is partial
132132
# overlap with the first 2 overloads.

tests/test_frame.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,8 @@ def test_frame_iterator() -> None:
682682
"""Test iterator methods for a dataframe GH1217."""
683683
df = pd.DataFrame(data={"col1": [2, 1], "col2": [3, 4]})
684684

685-
check(assert_type(next(df.items()), tuple[Hashable, "pd.Series"]), tuple)
686-
check(assert_type(next(df.iterrows()), tuple[Hashable, "pd.Series"]), tuple)
685+
check(assert_type(next(df.items()), tuple[Hashable, pd.Series]), tuple)
686+
check(assert_type(next(df.iterrows()), tuple[Hashable, pd.Series]), tuple)
687687
check(assert_type(next(df.itertuples()), _PandasNamedTuple), _PandasNamedTuple)
688688

689689

@@ -3101,30 +3101,28 @@ def test_frame_stack() -> None:
31013101
upper="2.2.99",
31023102
):
31033103
check(
3104-
assert_type(
3105-
df_multi_level_cols2.stack(0), Union[pd.DataFrame, "pd.Series"]
3106-
),
3104+
assert_type(df_multi_level_cols2.stack(0), Union[pd.DataFrame, pd.Series]),
31073105
pd.DataFrame,
31083106
)
31093107
check(
31103108
assert_type(
31113109
df_multi_level_cols2.stack([0, 1]),
3112-
Union[pd.DataFrame, "pd.Series"],
3110+
Union[pd.DataFrame, pd.Series],
31133111
),
31143112
pd.Series,
31153113
)
31163114
if PD_LTE_22:
31173115
check(
31183116
assert_type(
31193117
df_multi_level_cols2.stack(0, future_stack=False),
3120-
Union[pd.DataFrame, "pd.Series"],
3118+
Union[pd.DataFrame, pd.Series],
31213119
),
31223120
pd.DataFrame,
31233121
)
31243122
check(
31253123
assert_type(
31263124
df_multi_level_cols2.stack(0, dropna=True, sort=True),
3127-
Union[pd.DataFrame, "pd.Series"],
3125+
Union[pd.DataFrame, pd.Series],
31283126
),
31293127
pd.DataFrame,
31303128
)

tests/test_series.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2872,13 +2872,13 @@ def test_astype_object(cast_arg: ObjectDtypeArg, target_type: type) -> None:
28722872

28732873
if TYPE_CHECKING:
28742874
# python object
2875-
assert_type(s.astype(object), "pd.Series")
2876-
assert_type(s.astype("object"), "pd.Series")
2875+
assert_type(s.astype(object), pd.Series)
2876+
assert_type(s.astype("object"), pd.Series)
28772877
# numpy object
2878-
assert_type(s.astype(np.object_), "pd.Series")
2879-
# assert_type(s.astype("object_"), "pd.Series") # NOTE: not assigned
2880-
# assert_type(s.astype("object0"), "pd.Series") # NOTE: not assigned
2881-
assert_type(s.astype("O"), "pd.Series")
2878+
assert_type(s.astype(np.object_), pd.Series)
2879+
# assert_type(s.astype("object_"), pd.Series) # NOTE: not assigned
2880+
# assert_type(s.astype("object0"), pd.Series) # NOTE: not assigned
2881+
assert_type(s.astype("O"), pd.Series)
28822882

28832883

28842884
@pytest.mark.parametrize("cast_arg, target_type", ASTYPE_VOID_ARGS, ids=repr)
@@ -2888,9 +2888,9 @@ def test_astype_void(cast_arg: VoidDtypeArg, target_type: type) -> None:
28882888

28892889
if TYPE_CHECKING:
28902890
# numpy void
2891-
assert_type(s.astype(np.void), "pd.Series")
2892-
assert_type(s.astype("void"), "pd.Series")
2893-
assert_type(s.astype("V"), "pd.Series")
2891+
assert_type(s.astype(np.void), pd.Series)
2892+
assert_type(s.astype("void"), pd.Series)
2893+
assert_type(s.astype("V"), pd.Series)
28942894

28952895

28962896
def test_astype_other() -> None:
@@ -2902,7 +2902,7 @@ def test_astype_other() -> None:
29022902

29032903
# Test self-consistent with s.dtype (#747)
29042904
# NOTE: https://github.com/python/typing/issues/801#issuecomment-1646171898
2905-
check(assert_type(s.astype(s.dtype), "pd.Series"), pd.Series, np.integer)
2905+
check(assert_type(s.astype(s.dtype), pd.Series), pd.Series, np.integer)
29062906

29072907
# test DecimalDtype
29082908
orseries = pd.Series([Decimal(x) for x in [1, 2, 3]])
@@ -2917,7 +2917,7 @@ def test_astype_other() -> None:
29172917
# Test non-literal string
29182918
# NOTE: currently unsupported! Enable in future.
29192919
# string: str = "int" # not Literal!
2920-
# check(assert_type(s.astype(string), "pd.Series"), pd.Series, np.integer)
2920+
# check(assert_type(s.astype(string), pd.Series), pd.Series, np.integer)
29212921

29222922

29232923
def test_all_astype_args_tested() -> None:
@@ -3224,7 +3224,7 @@ def test_get() -> None:
32243224

32253225
def test_series_new_empty() -> None:
32263226
# GH 826
3227-
check(assert_type(pd.Series(), "pd.Series"), pd.Series)
3227+
check(assert_type(pd.Series(), pd.Series), pd.Series)
32283228

32293229

32303230
def test_series_mapping() -> None:
@@ -3406,10 +3406,10 @@ def first_arg_not_series(argument_1: int, ser: pd.Series) -> pd.Series:
34063406

34073407
def test_series_apply() -> None:
34083408
s = pd.Series(["A", "B", "AB"])
3409-
check(assert_type(s.apply(tuple), "pd.Series"), pd.Series)
3410-
check(assert_type(s.apply(list), "pd.Series"), pd.Series)
3411-
check(assert_type(s.apply(set), "pd.Series"), pd.Series)
3412-
check(assert_type(s.apply(frozenset), "pd.Series"), pd.Series)
3409+
check(assert_type(s.apply(tuple), pd.Series), pd.Series)
3410+
check(assert_type(s.apply(list), pd.Series), pd.Series)
3411+
check(assert_type(s.apply(set), pd.Series), pd.Series)
3412+
check(assert_type(s.apply(frozenset), pd.Series), pd.Series)
34133413

34143414

34153415
def test_diff() -> None:
@@ -3571,7 +3571,7 @@ def callable(x: int) -> str:
35713571

35723572
unknown_series = pd.Series([1, 0, None])
35733573
check(
3574-
assert_type(unknown_series.map({1: True, 0: False, None: None}), "pd.Series"),
3574+
assert_type(unknown_series.map({1: True, 0: False, None: None}), pd.Series),
35753575
pd.Series,
35763576
)
35773577

@@ -3673,8 +3673,8 @@ class MyDict(TypedDict):
36733673
def test_series_empty_dtype() -> None:
36743674
"""Test for the creation of a Series from an empty list GH571 to map to a Series."""
36753675
new_tab: Sequence[Never] = [] # need to be typehinted to please mypy
3676-
check(assert_type(pd.Series(new_tab), "pd.Series"), pd.Series)
3677-
check(assert_type(pd.Series([]), "pd.Series"), pd.Series)
3676+
check(assert_type(pd.Series(new_tab), pd.Series), pd.Series)
3677+
check(assert_type(pd.Series([]), pd.Series), pd.Series)
36783678
# ensure that an empty string does not get matched to Sequence[Never]
36793679
check(assert_type(pd.Series(""), "pd.Series[str]"), pd.Series)
36803680

0 commit comments

Comments
 (0)