Skip to content

Fix passing empty label to df drop #21515

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.

Sign up for GitHub

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 14 commits into from
Jun 21, 2018
Merged

Fix passing empty label to df drop #21515

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
35742fc
Fix passing empty label to df drop
alimcmaster1 Jun 17, 2018
832a50b
Pep8
alimcmaster1 Jun 17, 2018
bb80ded
Pep8
alimcmaster1 Jun 17, 2018
a81c74a
Update per toobaz comments
alimcmaster1 Jun 18, 2018
394b384
Update per comment jreback
alimcmaster1 Jun 18, 2018
93bbf05
Pep8
alimcmaster1 Jun 19, 2018
1b832d0
Update per comment jreback
alimcmaster1 Jun 19, 2018
8119f72
Update per comment jreback
alimcmaster1 Jun 19, 2018
9d5a42f
Merge branch 'master' into PR_TOOL_MERGE_PR_21515
jreback Jun 20, 2018
01f6a9c
clean tests
jreback Jun 20, 2018
13b36c2
Parameterize test cases
alimcmaster1 Jun 20, 2018
d5f67e1
Merge remote-tracking branch 'origin/df-drop-errors-2' into df-drop-e…
alimcmaster1 Jun 20, 2018
1ffc0d4
Parameterize test cases
alimcmaster1 Jun 21, 2018
454cb7e
Merge branch 'master' into df-drop-errors-2
toobaz Jun 21, 2018
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
59 changes: 32 additions & 27 deletions pandas/tests/series/indexing/test_alter_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,22 +472,25 @@ def test_rename():
assert result.name == expected.name


@pytest.mark.parametrize('data, index, drop_labels,'
' axis, expected_data, expected_index',
[([1, 2], ['one', 'two'], ['two'],
0, [1], ['one']),
# Unique Index
([1, 2], ['one', 'two'], ['two'],
'rows', [1], ['one']),
([1, 1, 2], ['one', 'two', 'one'], ['two'],
0, [1, 2], ['one', 'one']),
# GH 5248 Non-Unique Index
([1, 1, 2], ['one', 'two', 'one'], 'two',
0, [1, 2], ['one', 'one']),
([1, 1, 2], ['one', 'two', 'one'], ['one'],
0, [1], ['two']),
([1, 1, 2], ['one', 'two', 'one'], 'one',
0, [1], ['two'])])
@pytest.mark.parametrize(
'data, index, drop_labels,'
' axis, expected_data, expected_index',
[
# Unique Index
([1, 2], ['one', 'two'], ['two'],
0, [1], ['one']),
([1, 2], ['one', 'two'], ['two'],
'rows', [1], ['one']),
([1, 1, 2], ['one', 'two', 'one'], ['two'],
0, [1, 2], ['one', 'one']),

# GH 5248 Non-Unique Index
([1, 1, 2], ['one', 'two', 'one'], 'two',
0, [1, 2], ['one', 'one']),
([1, 1, 2], ['one', 'two', 'one'], ['one'],
0, [1], ['two']),
([1, 1, 2], ['one', 'two', 'one'], 'one',
0, [1], ['two'])])
def test_drop_unique_and_non_unique_index(data, index, axis, drop_labels,
expected_data, expected_index):

Expand All @@ -497,17 +500,19 @@ def test_drop_unique_and_non_unique_index(data, index, axis, drop_labels,
tm.assert_series_equal(result, expected)


@pytest.mark.parametrize('data, index, drop_labels,'
' axis, error_type, error_desc',
[(range(3), list('abc'), 'bc',
0, KeyError, 'not found in axis'),
# single string/tuple-like
(range(3), list('abc'), ('a',),
0, KeyError, 'not found in axis'),
(range(3), list('abc'), 'one',
'columns', ValueError, 'No axis named columns')
# bad axis
])
@pytest.mark.parametrize(
'data, index, drop_labels,'
' axis, error_type, error_desc',
[
# single string/tuple-like
(range(3), list('abc'), 'bc',
0, KeyError, 'not found in axis'),

# bad axis
(range(3), list('abc'), ('a',),
0, KeyError, 'not found in axis'),
(range(3), list('abc'), 'one',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @jreback that't much neater than my attempt!

'columns', ValueError, 'No axis named columns')])
def test_drop_exception_raised(data, index, drop_labels,
axis, error_type, error_desc):

Expand Down