Skip to content

Commit 962fcb1

Browse files
author
tp
committed
changed according to comments
1 parent ad06799 commit 962fcb1

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

doc/source/whatsnew/v0.24.0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ Numeric
185185
^^^^^^^
186186

187187
- Bug in :class:`Series` ``__rmatmul__`` doesn't support matrix vector multiplication (:issue:`21530`)
188-
-
188+
- :meth:`~DataFrame.agg` now handles built-in methods like ``sum`` with axis=1 (:issue:`21224`)
189189
-
190190

191191
Strings

pandas/conftest.py

+15
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,21 @@ def spmatrix(request):
5454
return getattr(sparse, request.param + '_matrix')
5555

5656

57+
@pytest.fixture(params=[0, 1],
58+
ids=lambda x: "axis {}".format(x))
59+
def axis(request):
60+
"""
61+
Fixture for returning the axis numbers of a dataframe.
62+
"""
63+
return request.param
64+
65+
@pytest.fixture(params=[0], ids=lambda x: "axis {}".format(x))
66+
def axis_series(request):
67+
"""
68+
Fixture for returning the axis numbers of a series.
69+
"""
70+
return request.param
71+
5772
@pytest.fixture
5873
def ip():
5974
"""

pandas/core/indexing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1829,7 +1829,7 @@ def error():
18291829
error()
18301830
raise
18311831
except:
1832-
raise
1832+
raise error()
18331833

18341834
if not ax.contains(key):
18351835
error()

pandas/tests/frame/test_analytics.py

-1
Original file line numberDiff line numberDiff line change
@@ -2094,7 +2094,6 @@ def test_clip_against_list_like(self, inplace, lower, axis, res):
20942094
@pytest.mark.xfail(
20952095
not _np_version_under1p15,
20962096
reason="failing under numpy-dev gh-19976")
2097-
@pytest.mark.parametrize("axis", [0, 1, None])
20982097
def test_clip_against_frame(self, axis):
20992098
df = DataFrame(np.random.randn(1000, 2))
21002099
lb = DataFrame(np.random.randn(1000, 2))

pandas/tests/generic/test_label_or_level_utils.py

-7
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ def assert_level_reference(frame, levels, axis):
7676

7777
# DataFrame
7878
# ---------
79-
@pytest.mark.parametrize('axis', [0, 1])
8079
def test_is_level_or_label_reference_df_simple(df_levels, axis):
8180

8281
# Compute expected labels and levels
@@ -91,7 +90,6 @@ def test_is_level_or_label_reference_df_simple(df_levels, axis):
9190
assert_label_reference(df_levels, expected_labels, axis=axis)
9291

9392

94-
@pytest.mark.parametrize('axis', [0, 1])
9593
def test_is_level_reference_df_ambig(df_ambig, axis):
9694

9795
# Transpose frame if axis == 1
@@ -165,7 +163,6 @@ def test_is_label_or_level_reference_panel_error(panel):
165163

166164
# DataFrame
167165
# ---------
168-
@pytest.mark.parametrize('axis', [0, 1])
169166
def test_check_label_or_level_ambiguity_df(df_ambig, axis):
170167

171168
# Transpose frame if axis == 1
@@ -264,7 +261,6 @@ def assert_level_values(frame, levels, axis):
264261

265262
# DataFrame
266263
# ---------
267-
@pytest.mark.parametrize('axis', [0, 1])
268264
def test_get_label_or_level_values_df_simple(df_levels, axis):
269265

270266
# Compute expected labels and levels
@@ -279,7 +275,6 @@ def test_get_label_or_level_values_df_simple(df_levels, axis):
279275
assert_level_values(df_levels, expected_levels, axis=axis)
280276

281277

282-
@pytest.mark.parametrize('axis', [0, 1])
283278
def test_get_label_or_level_values_df_ambig(df_ambig, axis):
284279

285280
# Transpose frame if axis == 1
@@ -300,7 +295,6 @@ def test_get_label_or_level_values_df_ambig(df_ambig, axis):
300295
assert_label_values(df_ambig, ['L3'], axis=axis)
301296

302297

303-
@pytest.mark.parametrize('axis', [0, 1])
304298
def test_get_label_or_level_values_df_duplabels(df_duplabels, axis):
305299

306300
# Transpose frame if axis == 1
@@ -383,7 +377,6 @@ def assert_levels_dropped(frame, levels, axis):
383377

384378
# DataFrame
385379
# ---------
386-
@pytest.mark.parametrize('axis', [0, 1])
387380
def test_drop_labels_or_levels_df(df_levels, axis):
388381

389382
# Compute expected labels and levels

0 commit comments

Comments
 (0)