Skip to content

CLN: Some unit tests #58599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pandas/tests/apply/test_frame_apply.py
Original file line number Diff line number Diff line change
Expand Up @@ -1489,7 +1489,7 @@ def test_apply_dtype(col):

def test_apply_mutating():
# GH#35462 case where applied func pins a new BlockManager to a row
df = DataFrame({"a": range(100), "b": range(100, 200)})
df = DataFrame({"a": range(10), "b": range(10, 20)})
df_orig = df.copy()

def func(row):
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/apply/test_str.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
],
)
@pytest.mark.parametrize("how", ["agg", "apply"])
def test_apply_with_string_funcs(request, float_frame, func, kwds, how):
def test_apply_with_string_funcs(float_frame, func, kwds, how):
result = getattr(float_frame, how)(func, **kwds)
expected = getattr(float_frame, func)(**kwds)
tm.assert_series_equal(result, expected)
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/arithmetic/test_datetime64.py
Original file line number Diff line number Diff line change
Expand Up @@ -1080,7 +1080,7 @@ def test_dt64arr_add_dtlike_raises(self, tz_naive_fixture, box_with_array):
@pytest.mark.parametrize("freq", ["h", "D", "W", "2ME", "MS", "QE", "B", None])
@pytest.mark.parametrize("dtype", [None, "uint8"])
def test_dt64arr_addsub_intlike(
self, request, dtype, index_or_series_or_array, freq, tz_naive_fixture
self, dtype, index_or_series_or_array, freq, tz_naive_fixture
):
# GH#19959, GH#19123, GH#19012
# GH#55860 use index_or_series_or_array instead of box_with_array
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/base/test_conversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ def test_numpy_array_all_dtypes(any_numpy_dtype):
),
],
)
def test_array(arr, attr, index_or_series, request):
def test_array(arr, attr, index_or_series):
box = index_or_series

result = box(arr, copy=False).array
Expand Down Expand Up @@ -383,7 +383,7 @@ def test_to_numpy_copy(arr, as_series, using_infer_string):


@pytest.mark.parametrize("as_series", [True, False])
def test_to_numpy_dtype(as_series, unit):
def test_to_numpy_dtype(as_series):
tz = "US/Eastern"
obj = pd.DatetimeIndex(["2000", "2001"], tz=tz)
if as_series:
Expand Down
17 changes: 2 additions & 15 deletions pandas/tests/base/test_value_counts.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ def test_value_counts(index_or_series_obj):
# i.e IntegerDtype
expected = expected.astype("Int64")

# TODO(GH#32514): Order of entries with the same count is inconsistent
# on CI (gh-32449)
if obj.duplicated().any():
result = result.sort_index()
expected = expected.sort_index()
tm.assert_series_equal(result, expected)


Expand Down Expand Up @@ -89,11 +84,6 @@ def test_value_counts_null(null_obj, index_or_series_obj):
expected.index.name = obj.name

result = obj.value_counts()
if obj.duplicated().any():
# TODO(GH#32514):
# Order of entries with the same count is inconsistent on CI (gh-32449)
expected = expected.sort_index()
result = result.sort_index()

if not isinstance(result.dtype, np.dtype):
if getattr(obj.dtype, "storage", "") == "pyarrow":
Expand All @@ -106,11 +96,8 @@ def test_value_counts_null(null_obj, index_or_series_obj):
expected[null_obj] = 3

result = obj.value_counts(dropna=False)
if obj.duplicated().any():
# TODO(GH#32514):
# Order of entries with the same count is inconsistent on CI (gh-32449)
expected = expected.sort_index()
result = result.sort_index()
expected = expected.sort_index()
result = result.sort_index()
tm.assert_series_equal(result, expected)


Expand Down
11 changes: 5 additions & 6 deletions pandas/tests/computation/test_eval.py
Original file line number Diff line number Diff line change
Expand Up @@ -1984,9 +1984,8 @@ def test_set_inplace():
tm.assert_series_equal(result_view["A"], expected)


class TestValidate:
@pytest.mark.parametrize("value", [1, "True", [1, 2, 3], 5.0])
def test_validate_bool_args(self, value):
msg = 'For argument "inplace" expected type bool, received type'
with pytest.raises(ValueError, match=msg):
pd.eval("2+2", inplace=value)
@pytest.mark.parametrize("value", [1, "True", [1, 2, 3], 5.0])
def test_validate_bool_args(value):
msg = 'For argument "inplace" expected type bool, received type'
with pytest.raises(ValueError, match=msg):
pd.eval("2+2", inplace=value)
1 change: 1 addition & 0 deletions pandas/tests/frame/test_ufunc.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ def test_alignment_deprecation_enforced():
np.add(s2, df1)


@pytest.mark.single_cpu
def test_alignment_deprecation_many_inputs_enforced():
# Enforced in 2.0
# https://github.com/pandas-dev/pandas/issues/39184
Expand Down
3 changes: 1 addition & 2 deletions pandas/tests/test_multilevel.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ def test_groupby_multilevel(self, multiindex_year_month_day_dataframe_random_dat

expected = ymd.groupby([k1, k2]).mean()

# TODO groupby with level_values drops names
tm.assert_frame_equal(result, expected, check_names=False)
tm.assert_frame_equal(result, expected)
assert result.index.names == ymd.index.names[:2]

result2 = ymd.groupby(level=ymd.index.names[:2]).mean()
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/window/test_expanding.py
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ def test_expanding_cov_pairwise_diff_length():
df2a = DataFrame(
[[5, 6], [2, 1]], index=[0, 2], columns=Index(["X", "Y"], name="foo")
)
# TODO: xref gh-15826
# xref gh-15826
# .loc is not preserving the names
result1 = df1.expanding().cov(df2, pairwise=True).loc[2]
result2 = df1.expanding().cov(df2a, pairwise=True).loc[2]
Expand Down