8000 BUG: divmod return type by TomAugspurger · Pull Request #22932 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

BUG: divmod return type #22932

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 15 commits into from
Oct 8, 2018
Merged

BUG: divmod return type #22932

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
52538fa
BUG: divmod return type
TomAugspurger Oct 1, 2018
c92a4a8
Update old test
TomAugspurger Oct 1, 2018
1b4261f
Merge remote-tracking branch 'upstream/master' into ea-divmod
TomAugspurger Oct 2, 2018
0671e7d
Fixup
TomAugspurger Oct 2, 2018
35d4213
Merge remote-tracking branch 'upstream/master' into ea-divmod
TomAugspurger Oct 3, 2018
7ef697c
Use super
TomAugspurger Oct 3, 2018
c9fe5d3
make strict
TomAugspurger Oct 3, 2018
2247461
Test op(Series[EA], EA])
TomAugspurger Oct 3, 2018
a0cd5e7
TypeError for Series
TomAugspurger Oct 3, 2018
11a0d93
typerror
TomAugspurger Oct 3, 2018
cc2bfc8
Merge remote-tracking branch 'upstream/master' into ea-divmod
TomAugspurger Oct 4, 2018
4e9b7f0
doc update
TomAugspurger Oct 4, 2018
95d5cbf
typo, import
TomAugspurger Oct 4, 2018
c9d6e89
xpass -> skip
TomAugspurger Oct 4, 2018
ec814db
Move
TomAugspurger Oct 5, 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
Prev Previous commit
Next Next commit
Fixup
  • Loading branch information
@TomAugspurger
TomAugspurger committed Oct 2, 2018
commit 0671e7d67df8b0aa258fd864ef5f3169fe0ffc55
19 changes: 18 additions & 1 deletion pandas/tests/extension/decimal/test_decimal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

from pandas.tests.extension import base

from .array import DecimalDtype, DecimalArray
from .array import DecimalDtype, DecimalArray, to_decimal


def make_data():
Expand Down Expand Up @@ -244,6 +244,23 @@ def test_arith_series_with_array(self, data, all_arithmetic_operators):
context.traps[decimal.DivisionByZero] = divbyzerotrap
context.traps[decimal.InvalidOperation] = invalidoptrap

@pytest.mark.parametrize("reverse, expected_div, expected_mod", [
(False, [0, 1, 1, 2], [1, 0, 1, 0]),
(True, [2, 1, 0, 0], [0, 0, 2, 2]),
])
def test_divmod_array(self, reverse, expected_div, expected_mod):
# https://github.com/pandas-dev/pandas/issues/22930
Copy link
Member

Choose a reason for hiding this comment

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

Should we try to better indicate that this is an "extra" test (not overriding a base one)?

(not necessarily needs to be solved here, but question is relevant in general, as we sometimes add tests to eg decimal to test specific aspects not covered in the base tests, to clearly see which those tests are. Maybe we would put them outside the class?)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Having it off the class makes the most sense. Moved.

arr = to_decimal([1, 2, 3, 4])
if reverse:
div, mod = divmod(2, arr)
else:
div, mod = divmod(arr, 2)
expected_div = to_decimal(expected_div)
expected_mod = to_decimal(expected_mod)

tm.assert_extension_array_equal(div, expected_div)
tm.assert_extension_array_equal(mod, expected_mod)

def test_divmod(self, data):
s = pd.Series(data, name='name')
a, b = divmod(s, 2)
Expand Down
22 changes: 0 additions & 22 deletions pandas/tests/extension/test_ops.py
View file
Open in desktop

This file was deleted.

0